BSD 4_4 release

[unix-history] / usr / src / usr.bin / mail / vars.c

diff --git a/usr/src/usr.bin/mail/vars.c b/usr/src/usr.bin/mail/vars.c
index 7f07f93..2a90442 100644 (file)
--- a/usr/src/usr.bin/mail/vars.c
+++ b/usr/src/usr.bin/mail/vars.c
@@ -1,6 +1,42 @@
-#
+/*
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)vars.c     8.1 (Berkeley) 6/6/93";
+#endif /* not lint */

 
 #include "rcv.h"
 
 #include "rcv.h"

+#include "extern.h"

 
 /*
  * Mail -- a mail program
 
 /*
  * Mail -- a mail program


@@ -8,12 +44,10 @@
  * Variable handling stuff.
  */
 
  * Variable handling stuff.
  */
 

-static char *SccsId = "@(#)vars.c      2.2 %G%";
-

 /*
  * Assign a value to a variable.
  */
 /*
  * Assign a value to a variable.
  */

-
+void

 assign(name, value)
        char name[], value[];
 {
 assign(name, value)
        char name[], value[];
 {


@@ -38,12 +72,12 @@ assign(name, value)
  * strings whose value is "" since they are expected to be frequent.
  * Thus, we cannot free same!
  */
  * strings whose value is "" since they are expected to be frequent.
  * Thus, we cannot free same!
  */

-
+void

 vfree(cp)
 vfree(cp)

-       register char *cp;
+       char *cp;

 {
 {

-       if (!equal(cp, ""))
-               cfree(cp);
+       if (*cp)
+               free(cp);

 }
 
 /*
 }
 
 /*


@@ -55,16 +89,16 @@ char *
 vcopy(str)
        char str[];
 {
 vcopy(str)
        char str[];
 {

-       register char *top, *cp, *cp2;
-
-       if (equal(str, ""))
-               return("");
-       top = calloc(strlen(str)+1, 1);
-       cp = top;
-       cp2 = str;
-       while (*cp++ = *cp2++)
-               ;
-       return(top);
+       char *new;
+       unsigned len;
+
+       if (*str == '\0')
+               return "";
+       len = strlen(str) + 1;
+       if ((new = malloc(len)) == NULL)
+               panic("Out of memory");
+       bcopy(str, new, (int) len);
+       return new;

 }
 
 /*
 }
 
 /*


@@ -90,14 +124,12 @@ value(name)
 
 struct var *
 lookup(name)
 
 struct var *
 lookup(name)

-       char name[];
+       register char name[];

 {
        register struct var *vp;
 {
        register struct var *vp;

-       register int h;

 
 

-       h = hash(name);
-       for (vp = variables[h]; vp != NOVAR; vp = vp->v_link)
-               if (equal(vp->v_name, name))
+       for (vp = variables[hash(name)]; vp != NOVAR; vp = vp->v_link)
+               if (*vp->v_name == *name && equal(vp->v_name, name))

                        return(vp);
        return(NOVAR);
 }
                        return(vp);
        return(NOVAR);
 }


@@ -108,14 +140,12 @@ lookup(name)
 
 struct grouphead *
 findgroup(name)
 
 struct grouphead *
 findgroup(name)

-       char name[];
+       register char name[];

 {
        register struct grouphead *gh;
 {
        register struct grouphead *gh;

-       register int h;

 
 

-       h = hash(name);
-       for (gh = groups[h]; gh != NOGRP; gh = gh->g_link)
-               if (equal(gh->g_name, name))
+       for (gh = groups[hash(name)]; gh != NOGRP; gh = gh->g_link)
+               if (*gh->g_name == *name && equal(gh->g_name, name))

                        return(gh);
        return(NOGRP);
 }
                        return(gh);
        return(NOGRP);
 }


@@ -123,7 +153,7 @@ findgroup(name)
 /*
  * Print a group out on stdout
  */
 /*
  * Print a group out on stdout
  */

-
+void

 printgroup(name)
        char name[];
 {
 printgroup(name)
        char name[];
 {


@@ -137,25 +167,24 @@ printgroup(name)
        printf("%s\t", gh->g_name);
        for (gp = gh->g_list; gp != NOGE; gp = gp->ge_link)
                printf(" %s", gp->ge_name);
        printf("%s\t", gh->g_name);
        for (gp = gh->g_list; gp != NOGE; gp = gp->ge_link)
                printf(" %s", gp->ge_name);

-       printf("\n");
+       putchar('\n');

 }
 
 /*
  * Hash the passed string and return an index into
  * the variable or group hash table.
  */
 }
 
 /*
  * Hash the passed string and return an index into
  * the variable or group hash table.
  */

-
+int

 hash(name)
 hash(name)

-       char name[];
+       register char *name;

 {
 {

-       register int h;
-       register char *cp;
+       register h = 0;

 
 

-       for (cp = name, h = 0; *cp; h = (h << 2) + *cp++)
-               ;
-       if (h < 0)
-               h = -h;
-       if (h < 0)
+       while (*name) {
+               h <<= 2;
+               h += *name++;
+       }
+       if (h < 0 && (h = -h) < 0)

                h = 0;
                h = 0;

-       return(h % HSHSIZE);
+       return (h % HSHSIZE);

 }
 }