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

Diff for /src/usr.bin/sdiff/sdiff.c between version 1.9 and 1.10

version 1.9, 2005/12/27 04:46:32 version 1.10, 2005/12/27 05:04:27
Line 85 
Line 85 
 main(int argc, char **argv)  main(int argc, char **argv)
 {  {
         FILE *difffile, *origfile;          FILE *difffile, *origfile;
         size_t argc_max, diffargc, wflag;          size_t diffargc = 0, wflag = WIDTH;
         int ch, fd[2], status;          int ch, fd[2], status;
         pid_t pid;          pid_t pid;
         const char *cmd, **diffargv, *diffprog;          const char *cmd, **diffargv, *diffprog = "diff";
   
         /* Initialize variables. */  
         diffargc = 0;  
         diffprog = "diff";  
         outfile = NULL;  
         wflag = WIDTH;  
   
         /*          /*
          * Process diff flags.           * Process diff flags.
          */           */
Line 107 
Line 101 
          * waste some memory; however we need an extra space for the           * waste some memory; however we need an extra space for the
          * NULL at the end, so it sort of works out.           * NULL at the end, so it sort of works out.
          */           */
         argc_max = argc * 2;          if (!(diffargv = malloc(sizeof(char **) * argc * 2)))
         if (!(diffargv = malloc(sizeof(char **) * argc_max)))  
                 err(2, "main");                  err(2, "main");
   
         /* Add first argument, the program name. */          /* Add first argument, the program name. */
Legend:
Removed from v.1.9  
changed lines
  Added in v.1.10