4.3BSD - /usr/src/new/news/uucp/uux.minus.c

   1: *** /tmp/uux.c.old  Sat Apr  2 20:16:45 1983
   2: --- /tmp/uux.c.new  Sat Apr  2 20:16:54 1983
   3: ***************
   4: *** 11,18
   5:   *cmdp++ = ' ';\
   6:   *cmdp = '\0';}
   7: 
   8: ! #define GENSEND(f, a, b, c, d) {\
   9: ! fprintf(f, "S %s %s %s - %s 0666\n", a, b, c, d);\
  10:   }
  11:   #define GENRCV(f, a, b, c) {\
  12:   fprintf(f, "R %s %s %s - \n", a, b, c);\
  13: 
  14: --- 11,18 -----
  15:   *cmdp++ = ' ';\
  16:   *cmdp = '\0';}
  17: 
  18: ! #define GENSEND(f, a, b, c, d, e) {\
  19: ! fprintf(f, "S %s %s %s -%s %s 0666\n", a, b, c, d, e);\
  20:   }
  21:   #define GENRCV(f, a, b, c) {\
  22:   fprintf(f, "R %s %s %s - \n", a, b, c);\
  23: ***************
  24: *** 36,41
  25:     char inargs[BUFSIZ];
  26:     int pipein = 0;
  27:     int startjob = 1;
  28:     char path[MAXFULLNAME];
  29:     char cmd[BUFSIZ];
  30:     char *ap, *cmdp;
  31: 
  32: --- 36,42 -----
  33:     char inargs[BUFSIZ];
  34:     int pipein = 0;
  35:     int startjob = 1;
  36: +   int Copy = 1;
  37:     char path[MAXFULLNAME];
  38:     char cmd[BUFSIZ];
  39:     char *ap, *cmdp;
  40: ***************
  41: *** 65,70
  42:         case 'r':
  43:             startjob = 0;
  44:             break;
  45:         case 'x':
  46:             Debug = atoi(&argv[1][2]);
  47:             if (Debug <= 0)
  48: 
  49: --- 66,74 -----
  50:         case 'r':
  51:             startjob = 0;
  52:             break;
  53: +       case 'c':
  54: +           Copy = 0;
  55: +           break;
  56:         case 'x':
  57:             Debug = atoi(&argv[1][2]);
  58:             if (Debug <= 0)
  59: ***************
  60: *** 148,154
  61:         }
  62:         fclose(fpd);
  63:         if (strcmp(local, xsys) != SAME) {
  64: !           GENSEND(fpc, dfile, dfile, User, dfile);
  65:             cflag++;
  66:         }
  67:         fprintf(fprx, "%c %s\n", X_RQDFILE, dfile);
  68: 
  69: --- 152,158 -----
  70:         }
  71:         fclose(fpd);
  72:         if (strcmp(local, xsys) != SAME) {
  73: !           GENSEND(fpc, dfile, dfile, User, "", dfile);
  74:             cflag++;
  75:         }
  76:         fprintf(fprx, "%c %s\n", X_RQDFILE, dfile);
  77: ***************
  78: *** 230,240
  79:                 fprintf(stderr, "permission denied %s\n", rest);
  80:                 cleanup(1);
  81:             }
  82: !           if (xcp(rest, dfile) != 0) {
  83: !               fprintf(stderr, "can't copy %s to %s\n", rest, dfile);
  84: !               cleanup(1);
  85: !           }
  86: !           GENSEND(fpc, rest, dfile, User, dfile);
  87:             cflag++;
  88:             if (redir == '<') {
  89:                 fprintf(fprx, "%c %s\n", X_STDIN, dfile);
  90: 
  91: --- 234,247 -----
  92:                 fprintf(stderr, "permission denied %s\n", rest);
  93:                 cleanup(1);
  94:             }
  95: !           if (Copy) {
  96: !               if (xcp(rest, dfile) != 0) {
  97: !                   fprintf(stderr, "can't copy %s to %s\n", rest, dfile);
  98: !                   cleanup(1);
  99: !               }
 100: !               GENSEND(fpc, rest, dfile, User, "", dfile);
 101: !           } else
 102: !               GENSEND(fpc, rest, dfile, User, "c", dfile);
 103:             cflag++;
 104:             if (redir == '<') {
 105:                 fprintf(fprx, "%c %s\n", X_STDIN, dfile);
 106: ***************
 107: *** 288,294
 108:             gename(DATAPRE, xsys, 'T', t2file);
 109:             GENRCV(fpd, rest, t2file, User);
 110:             fclose(fpd);
 111: !           GENSEND(fpc, dfile, tfile, User, dfile);
 112:             cflag++;
 113:             if (redir == '<') {
 114:                 fprintf(fprx, "%c %s\n", X_RQDFILE, t2file);
 115: 
 116: --- 295,301 -----
 117:             gename(DATAPRE, xsys, 'T', t2file);
 118:             GENRCV(fpd, rest, t2file, User);
 119:             fclose(fpd);
 120: !           GENSEND(fpc, dfile, tfile, User, "", dfile);
 121:             cflag++;
 122:             if (redir == '<') {
 123:                 fprintf(fprx, "%c %s\n", X_RQDFILE, t2file);
 124: ***************
 125: *** 332,338
 126:                 xuuxqt();
 127:     }
 128:     else {
 129: !       GENSEND(fpc, rxfile, tfile, User, rxfile);
 130:         cflag++;
 131:     }
 132: 
 133: 
 134: --- 339,345 -----
 135:                 xuuxqt();
 136:     }
 137:     else {
 138: !       GENSEND(fpc, rxfile, tfile, User, "", rxfile);
 139:         cflag++;
 140:     }

Defined variables

Defined macros