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

Diff for /src/usr.bin/rsync/main.c between version 1.33 and 1.34

version 1.33, 2019/03/18 08:11:11 version 1.34, 2019/03/23 00:20:55
Line 273 
Line 273 
 {  {
         struct opts      opts;          struct opts      opts;
         pid_t            child;          pid_t            child;
         int              fds[2], rc = 0, c, st, i;          int              fds[2], rc, c, st, i;
         struct sess       sess;          struct sess       sess;
         struct fargs    *fargs;          struct fargs    *fargs;
         char            **args;          char            **args;
Line 478 
Line 478 
          * So close the connection here so that they don't hang.           * So close the connection here so that they don't hang.
          */           */
   
         if (!rc)          if (rc)
                 close(fds[0]);                  close(fds[0]);
   
         if (waitpid(child, &st, 0) == -1)          if (waitpid(child, &st, 0) == -1)
                 err(1, "waitpid");                  err(1, "waitpid");
         if (!(WIFEXITED(st) && WEXITSTATUS(st) == 0))  
                 rc = 0;          /*
            * If we don't already have an error (rc == 0), then inherit the
            * error code of rsync_server() if it has exited.
            * If it hasn't exited, it overrides our return value.
            */
   
           if (WIFEXITED(st) && rc == 0)
                   rc = WEXITSTATUS(st);
           else if (!WIFEXITED(st))
                   rc = 1;
   
         exit(rc);          exit(rc);
 usage:  usage:
         fprintf(stderr, "usage: %s [-aDglnoprtv] [-e program] [--archive] [--delete] [--devices]\n"          fprintf(stderr, "usage: %s [-aDglnoprtv] [-e program] [--archive] [--delete] [--devices]\n"
Legend:
Removed from v.1.33  
changed lines
  Added in v.1.34