[BACK]Return to env.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / sudo

Diff for /src/usr.bin/sudo/Attic/env.c between version 1.20 and 1.21

version 1.20, 2009/06/21 14:48:42 version 1.21, 2009/06/24 13:55:56
Line 43 
Line 43 
 #ifdef HAVE_UNISTD_H  #ifdef HAVE_UNISTD_H
 # include <unistd.h>  # include <unistd.h>
 #endif /* HAVE_UNISTD_H */  #endif /* HAVE_UNISTD_H */
   #include <ctype.h>
 #include <errno.h>  #include <errno.h>
 #include <pwd.h>  #include <pwd.h>
   
 #include "sudo.h"  #include "sudo.h"
   
 #ifndef lint  #ifndef lint
 __unused static const char rcsid[] = "$Sudo: env.c,v 1.105 2009/06/15 13:10:01 millert Exp $";  __unused static const char rcsid[] = "$Sudo: env.c,v 1.106 2009/06/23 18:24:42 millert Exp $";
 #endif /* lint */  #endif /* lint */
   
 /*  /*
Line 849 
Line 850 
   
 /*  /*
  * Read in /etc/environment ala AIX and Linux.   * Read in /etc/environment ala AIX and Linux.
  * Lines are in the form of NAME=VALUE   * Lines may be in either of three formats:
    *  NAME=VALUE
    *  NAME="VALUE"
    *  NAME='VALUE'
    * with an optional "export" prefix so the shell can source the file.
  * Invalid lines, blank lines, or lines consisting solely of a comment   * Invalid lines, blank lines, or lines consisting solely of a comment
  * character are skipped.   * character are skipped.
  */   */
Line 859 
Line 864 
     int overwrite;      int overwrite;
 {  {
     FILE *fp;      FILE *fp;
     char *cp;      char *cp, *var, *val;
       size_t var_len, val_len;
   
     if ((fp = fopen(path, "r")) == NULL)      if ((fp = fopen(path, "r")) == NULL)
         return;          return;
   
     while ((cp = sudo_parseln(fp)) != NULL) {      while ((var = sudo_parseln(fp)) != NULL) {
         /* Skip blank or comment lines */          /* Skip blank or comment lines */
         if (*cp == '\0')          if (*var == '\0')
             continue;              continue;
   
         /* Must be of the form name=value */          /* Skip optional "export " */
         if (strchr(cp, '=') == NULL)          if (strncmp(var, "export", 6) == 0 && isspace((unsigned char) var[6])) {
               var += 7;
               while (isspace((unsigned char) *var)) {
                   var++;
               }
           }
   
           /* Must be of the form name=["']value['"] */
           for (val = var; *val != '\0' && *val != '='; val++)
               ;
           if (var == val || *val != '=')
             continue;              continue;
           var_len = (size_t)(val - var);
           val_len = strlen(++val);
   
         sudo_putenv(estrdup(cp), TRUE, overwrite);          /* Strip leading and trailing single/double quotes */
           if ((val[0] == '\'' || val[0] == '\"') && val[0] == val[val_len - 1]) {
               val[val_len - 1] = '\0';
               val++;
               val_len -= 2;
           }
   
           cp = emalloc(var_len + 1 + val_len + 1);
           memcpy(cp, var, var_len + 1); /* includes '=' */
           memcpy(cp + var_len + 1, val, val_len + 1); /* includes NUL */
   
           sudo_putenv(cp, TRUE, overwrite);
     }      }
     fclose(fp);      fclose(fp);
 }  }
Legend:
Removed from v.1.20  
changed lines
  Added in v.1.21