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

Diff for /src/usr.bin/which/which.c between version 1.17 and 1.18

version 1.17, 2011/03/11 04:30:21 version 1.18, 2013/04/10 02:57:20
Line 23 
Line 23 
 #include <err.h>  #include <err.h>
 #include <errno.h>  #include <errno.h>
 #include <locale.h>  #include <locale.h>
   #include <paths.h>
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
 #include <string.h>  #include <string.h>
Line 69 
Line 70 
         if (argc == 0)          if (argc == 0)
                 usage();                  usage();
   
         /*  
          * which(1) uses user's $PATH.  
          * whereis(1) uses user.cs_path from sysctl(3).  
          */  
         if (strcmp(__progname, "whereis") == 0) {          if (strcmp(__progname, "whereis") == 0) {
                 int mib[2];  
   
                 progmode = PROG_WHEREIS;                  progmode = PROG_WHEREIS;
                 mib[0] = CTL_USER;                  path = _PATH_STDPATH;
                 mib[1] = USER_CS_PATH;  
                 if (sysctl(mib, 2, NULL, &n, NULL, 0) == -1)  
                         err(1, "unable to get length of user.cs_path");  
                 if (n == 0)  
                         errx(1, "user.cs_path was zero length!");  
                 if ((path = (char *)malloc(n)) == NULL)  
                         errx(1, "can't allocate memory.");  
                 if (sysctl(mib, 2, path, &n, NULL, 0) == -1)  
                         err(1, "unable to get user.cs_path");  
         } else {          } else {
                 if ((path = getenv("PATH")) == NULL)                  if ((path = getenv("PATH")) == NULL)
                         err(1, "can't get $PATH from environment");                          err(1, "can't get $PATH from environment");
Legend:
Removed from v.1.17  
changed lines
  Added in v.1.18