1/* Still missing: 2 * |
3 * mkctm 4 * -B regex Bogus 5 * -I regex Ignore 6 * -D int Damage 7 * -q decrease verbosity 8 * -v increase verbosity |
9 * -l file logfile |
10 * name cvs-cur 11 * prefix src/secure 12 * dir1 "Soll" 13 * dir2 "Ist" 14 * 15 */ 16 17#include <sys/types.h> --- 7 unchanged lines hidden (view full) --- 25#include <string.h> 26#include <stdlib.h> 27#include <unistd.h> 28#include <md5.h> 29#include <err.h> 30#include <signal.h> 31 32#define DEFAULT_IGNORE "/CVS$|/\\.#|00_TRANS\\.TBL$" |
33#define DEFAULT_BOGUS "\\.core$|\\.orig$|\\.rej$|\\.o$" |
34regex_t reg_ignore, reg_bogus; 35int flag_ignore, flag_bogus; 36 37int verbose; 38int damage, damage_limit; 39int change; 40 |
41FILE *logf; 42 |
43u_long s1_ignored, s2_ignored; 44u_long s1_bogus, s2_bogus; 45u_long s1_wrong, s2_wrong; 46u_long s_new_dirs, s_new_files, s_new_bytes; 47u_long s_del_dirs, s_del_files, s_del_bytes; 48u_long s_files_chg, s_bytes_add, s_bytes_del; 49u_long s_same_dirs, s_same_files, s_same_bytes; 50u_long s_edit_files, s_edit_bytes, s_edit_saves; --- 11 unchanged lines hidden (view full) --- 62 fprintf(stderr, "\t\t-I ignore_regexp\n"); 63 fprintf(stderr, "\t\t-q\n"); 64 fprintf(stderr, "\t\t-v\n"); 65} 66 67void 68print_stat(FILE *fd, char *pre) 69{ |
70 fprintf(fd, "%sNames:\n", pre); 71 fprintf(fd, "%s ignore: %5lu ref %5lu target\n", |
72 pre, s1_ignored, s2_ignored); |
73 fprintf(fd, "%s bogus: %5lu ref %5lu target\n", |
74 pre, s1_bogus, s2_bogus); |
75 fprintf(fd, "%s wrong: %5lu ref %5lu target\n", |
76 pre, s1_wrong, s2_wrong); |
77 fprintf(fd, "%sDelta:\n", pre); 78 fprintf(fd, "%s new: %5lu dirs %5lu files %9lu plus\n", |
79 pre, s_new_dirs, s_new_files, s_new_bytes); |
80 fprintf(fd, "%s del: %5lu dirs %5lu files %9lu minus\n", |
81 pre, s_del_dirs, s_del_files, s_del_bytes); |
82 fprintf(fd, "%s chg: %5lu files %9lu plus %9lu minus\n", |
83 pre, s_files_chg, s_bytes_add, s_bytes_del); |
84 fprintf(fd, "%s same: %5lu dirs %5lu files %9lu bytes\n", |
85 pre, s_same_dirs, s_same_files, s_same_bytes); |
86 fprintf(fd, "%sMethod:\n", pre); 87 fprintf(fd, "%s edit: %5lu files %9lu bytes %9lu saved\n", |
88 pre, s_edit_files, s_edit_bytes, s_edit_saves); |
89 fprintf(fd, "%s sub: %5lu files %9lu bytes\n", |
90 pre, s_sub_files, s_sub_bytes); |
91 |
92} 93 94void 95stat_info(int foo) 96{ |
97 signal(SIGINFO, stat_info); 98 print_stat(stderr, "INFO: "); |
99} 100 101void DoDir(const char *dir1, const char *dir2, const char *name); 102 103static struct stat st; 104static __inline struct stat * 105StatFile(char *name) 106{ |
107 if (lstat(name, &st) < 0) 108 err(1, "Couldn't stat %s\n", name); |
109 return &st; 110} 111 112int 113dirselect(struct dirent *de) 114{ |
115 if (!strcmp(de->d_name, ".")) return 0; 116 if (!strcmp(de->d_name, "..")) return 0; |
117 return 1; 118} 119 120void 121name_stat(const char *pfx, const char *dir, const char *name, struct dirent *de) 122{ 123 char *buf = alloca(strlen(dir) + strlen(name) + 124 strlen(de->d_name) + 3); 125 struct stat *st; 126 |
127 strcpy(buf, dir); 128 strcat(buf, "/"); strcat(buf, name); 129 strcat(buf, "/"); strcat(buf, de->d_name); |
130 st = StatFile(buf); |
131 printf("%s %s%s %u %u %o", |
132 pfx, name, de->d_name, 133 st->st_uid, st->st_gid, st->st_mode & ~S_IFMT); |
134 fprintf(logf, "%s %s%s\n", pfx, name, de->d_name); |
135 if (verbose > 1) { |
136 fprintf(stderr, "%s %s%s\n", pfx, name, de->d_name); |
137 } 138} 139 140void 141Equ(const char *dir1, const char *dir2, const char *name, struct dirent *de) 142{ 143 if (de->d_type == DT_DIR) { 144 char *p = alloca(strlen(name)+strlen(de->d_name)+2); 145 |
146 strcpy(p, name); strcat(p, de->d_name); strcat(p, "/"); 147 DoDir(dir1, dir2, p); |
148 s_same_dirs++; 149 } else { 150 char *buf1 = alloca(strlen(dir1) + strlen(name) + 151 strlen(de->d_name) + 3); 152 char *buf2 = alloca(strlen(dir2) + strlen(name) + 153 strlen(de->d_name) + 3); |
154 char *m1, md5_1[33], *m2, md5_2[33]; 155 u_char *p1, *p2; 156 int fd1, fd2; 157 struct stat s1, s2; |
158 |
159 strcpy(buf1, dir1); 160 strcat(buf1, "/"); strcat(buf1, name); 161 strcat(buf1, "/"); strcat(buf1, de->d_name); 162 fd1 = open(buf1, O_RDONLY); |
163 if(fd1 < 0) { perror(buf1); exit(3); } |
164 fstat(fd1, &s1); 165 strcpy(buf2, dir2); 166 strcat(buf2, "/"); strcat(buf2, name); 167 strcat(buf2, "/"); strcat(buf2, de->d_name); 168 fd2 = open(buf2, O_RDONLY); |
169 if(fd2 < 0) { perror(buf2); exit(3); } |
170 fstat(fd2, &s2); |
171#if 0 172 /* XXX if we could just trust the size to change... */ 173 if (s1.st_size == s2.st_size) { 174 s_same_files++; 175 s_same_bytes += s1.st_size; 176 close(fd1); 177 close(fd2); 178 goto finish; 179 } 180#endif |
181 p1=mmap(0, s1.st_size, PROT_READ, MAP_PRIVATE, fd1, 0); |
182 if ((int)p1 == -1) { perror(buf1); exit(3); } 183 close(fd1); 184 |
185 p2=mmap(0, s2.st_size, PROT_READ, MAP_PRIVATE, fd2, 0); |
186 if ((int)p2 == -1) { perror(buf2); exit(3); } 187 close(fd2); 188 189 /* If identical, we're done. */ |
190 if((s1.st_size == s2.st_size) && !memcmp(p1, p2, s1.st_size)) { |
191 s_same_files++; 192 s_same_bytes += s1.st_size; 193 goto finish; 194 } 195 196 s_files_chg++; |
197 change++; 198 if (s1.st_size > s2.st_size) 199 s_bytes_del += (s1.st_size - s2.st_size); 200 else 201 s_bytes_add += (s2.st_size - s1.st_size); 202 203 m1 = MD5Data(p1, s1.st_size, md5_1); 204 m2 = MD5Data(p2, s2.st_size, md5_2); 205 206 /* Just a curiosity... */ |
207 if(!strcmp(m1, m2)) { |
208 if (s1.st_size != s2.st_size) 209 fprintf(stderr, 210 "Notice: MD5 same for files of diffent size:\n\t%s\n\t%s\n", |
211 buf1, buf2); |
212 goto finish; 213 } 214 215 { 216 u_long l = s2.st_size + 2; 217 u_char *cmd = alloca(strlen(buf1)+strlen(buf2)+100); 218 u_char *ob = alloca(l), *p; 219 int j; --- 32 unchanged lines hidden (view full) --- 252 buf2); 253 goto subst; 254 } 255 256 strcpy(cmd, "diff -n "); 257 strcat(cmd, buf1); 258 strcat(cmd, " "); 259 strcat(cmd, buf2); |
260 F = popen(cmd, "r"); |
261 for (j = 1, l = 0; l < s2.st_size; ) { 262 j = fread(ob+l, 1, s2.st_size - l, F); 263 if (j < 1) 264 break; 265 l += j; 266 continue; 267 } 268 if (j) { 269 l = 0; 270 while (EOF != fgetc(F)) 271 continue; 272 } 273 pclose(F); 274 275 if (l && l < s2.st_size) { |
276 name_stat("CTMFN", dir2, name, de); 277 printf(" %s %s %d\n", m1, m2, (unsigned)l); 278 fwrite(ob, 1, l, stdout); |
279 putchar('\n'); 280 s_edit_files++; 281 s_edit_bytes += l; 282 s_edit_saves += (s2.st_size - l); 283 } else { 284 subst: |
285 name_stat("CTMFS", dir2, name, de); 286 printf(" %s %s %u\n", m1, m2, (unsigned)s2.st_size); 287 fwrite(p2, 1, s2.st_size, stdout); |
288 putchar('\n'); 289 s_sub_files++; 290 s_sub_bytes += s2.st_size; 291 } 292 } 293 finish: |
294 munmap(p1, s1.st_size); 295 munmap(p2, s2.st_size); |
296 } 297} 298 299void 300Add(const char *dir1, const char *dir2, const char *name, struct dirent *de) 301{ 302 change++; 303 if (de->d_type == DT_DIR) { 304 char *p = alloca(strlen(name)+strlen(de->d_name)+2); |
305 strcpy(p, name); strcat(p, de->d_name); strcat(p, "/"); 306 name_stat("CTMDM", dir2, name, de); |
307 putchar('\n'); 308 s_new_dirs++; |
309 DoDir(dir1, dir2, p); |
310 } else if (de->d_type == DT_REG) { 311 char *buf2 = alloca(strlen(dir2) + strlen(name) + 312 strlen(de->d_name) + 3); 313 char *m2, md5_2[33]; 314 u_char *p1; 315 struct stat st; 316 int fd1; 317 |
318 strcpy(buf2, dir2); 319 strcat(buf2, "/"); strcat(buf2, name); 320 strcat(buf2, "/"); strcat(buf2, de->d_name); 321 fd1 = open(buf2, O_RDONLY); |
322 if (fd1 < 0) {perror(buf2); exit (3); } |
323 fstat(fd1, &st); 324 p1=mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, fd1, 0); |
325 if ((int)p1 == -1) { perror(buf2); exit(3); } 326 close(fd1); 327 m2 = MD5Data(p1, st.st_size, md5_2); |
328 name_stat("CTMFM", dir2, name, de); 329 printf(" %s %u\n", m2, (unsigned)st.st_size); 330 fwrite(p1, 1, st.st_size, stdout); |
331 putchar('\n'); |
332 munmap(p1, st.st_size); |
333 s_new_files++; 334 s_new_bytes += st.st_size; 335 } 336} 337 338void 339Del (const char *dir1, const char *dir2, const char *name, struct dirent *de) 340{ 341 damage++; 342 change++; 343 if (de->d_type == DT_DIR) { 344 char *p = alloca(strlen(name)+strlen(de->d_name)+2); |
345 strcpy(p, name); strcat(p, de->d_name); strcat(p, "/"); 346 DoDir(dir1, dir2, p); 347 printf("CTMDR %s%s\n", name, de->d_name); 348 fprintf(logf, "CTMDR %s%s\n", name, de->d_name); 349 if (verbose > 1) { 350 fprintf(stderr, "CTMDR %s%s\n", name, de->d_name); 351 } |
352 s_del_dirs++; 353 } else if (de->d_type == DT_REG) { 354 char *buf1 = alloca(strlen(dir1) + strlen(name) + 355 strlen(de->d_name) + 3); 356 char *m1, md5_1[33]; |
357 strcpy(buf1, dir1); 358 strcat(buf1, "/"); strcat(buf1, name); 359 strcat(buf1, "/"); strcat(buf1, de->d_name); |
360 m1 = MD5File(buf1, md5_1); |
361 printf("CTMFR %s%s %s\n", name, de->d_name, m1); 362 fprintf(logf, "CTMFR %s%s %s\n", name, de->d_name, m1); 363 if (verbose > 1) { 364 fprintf(stderr, "CTMFR %s%s\n", name, de->d_name); 365 } |
366 s_del_files++; 367 s_del_bytes += StatFile(buf1)->st_size; 368 } 369} 370 371void 372GetNext(int *i, int *n, struct dirent **nl, const char *dir, const char *name, u_long *ignored, u_long *bogus, u_long *wrong) 373{ 374 char buf[BUFSIZ]; 375 376 for (;;) { 377 for (;;) { 378 (*i)++; 379 if (*i >= *n) 380 return; 381 *buf = 0; 382 if (*dir != '/') |
383 strcat(buf, "/"); 384 strcat(buf, dir); |
385 if (buf[strlen(buf)-1] != '/') |
386 strcat(buf, "/"); 387 strcat(buf, name); |
388 if (buf[strlen(buf)-1] != '/') |
389 strcat(buf, "/"); 390 strcat(buf, nl[*i]->d_name); |
391 if (flag_ignore && |
392 !regexec(®_ignore, buf, 0, 0, 0)) { |
393 (*ignored)++; |
394 fprintf(logf, "Ignore %s\n", buf); |
395 if (verbose > 2) { |
396 fprintf(stderr, "Ignore %s\n", buf); |
397 } 398 } else if (flag_bogus && |
399 !regexec(®_bogus, buf, 0, 0, 0)) { |
400 (*bogus)++; |
401 fprintf(logf, "Bogus %s\n", buf); 402 fprintf(stderr, "Bogus %s\n", buf); 403 damage++; |
404 } else { 405 break; 406 } 407 free(nl[*i]); nl[*i] = 0; 408 } 409 /* If the filesystem didn't tell us, find type */ 410 if (nl[*i]->d_type == DT_UNKNOWN) 411 nl[*i]->d_type = IFTODT(StatFile(buf)->st_mode); 412 if (nl[*i]->d_type == DT_REG || nl[*i]->d_type == DT_DIR) 413 break; 414 (*wrong)++; 415 if (verbose > 0) |
416 fprintf(stderr, "Wrong %s\n", buf); |
417 free(nl[*i]); nl[*i] = 0; 418 } 419} 420 421void 422DoDir(const char *dir1, const char *dir2, const char *name) 423{ |
424 int i1, i2, n1, n2, i; 425 struct dirent **nl1, **nl2; |
426 char *buf1 = alloca(strlen(dir1) + strlen(name) + 4); 427 char *buf2 = alloca(strlen(dir2) + strlen(name) + 4); 428 |
429 strcpy(buf1, dir1); strcat(buf1, "/"); strcat(buf1, name); 430 strcpy(buf2, dir2); strcat(buf2, "/"); strcat(buf2, name); |
431 n1 = scandir(buf1, &nl1, dirselect, alphasort); 432 n2 = scandir(buf2, &nl2, dirselect, alphasort); 433 i1 = i2 = -1; 434 GetNext(&i1, &n1, nl1, dir1, name, &s1_ignored, &s1_bogus, &s1_wrong); 435 GetNext(&i2, &n2, nl2, dir2, name, &s2_ignored, &s2_bogus, &s2_wrong); 436 for (;i1 < n1 || i2 < n2;) { 437 438 if (damage_limit && damage > damage_limit) --- 9 unchanged lines hidden (view full) --- 448 GetNext(&i2, &n2, nl2, dir2, name, 449 &s2_ignored, &s2_bogus, &s2_wrong); 450 451 if (i1 >= n1 && i2 >= n2) { 452 /* Done */ 453 break; 454 } else if (i1 >= n1 && i2 < n2) { 455 /* end of list 1, add anything left on list 2 */ |
456 Add(dir1, dir2, name, nl2[i2]); |
457 free(nl2[i2]); nl2[i2] = 0; 458 } else if (i1 < n1 && i2 >= n2) { 459 /* end of list 2, delete anything left on list 1 */ |
460 Del(dir1, dir2, name, nl1[i1]); |
461 free(nl1[i1]); nl1[i1] = 0; 462 } else if (!(i = strcmp(nl1[i1]->d_name, nl2[i2]->d_name))) { 463 /* Identical names */ 464 if (nl1[i1]->d_type == nl2[i2]->d_type) { 465 /* same type */ |
466 Equ(dir1, dir2, name, nl1[i1]); |
467 } else { 468 /* different types */ |
469 Del(dir1, dir2, name, nl1[i1]); 470 Add(dir1, dir2, name, nl2[i2]); |
471 } 472 free(nl1[i1]); nl1[i1] = 0; 473 free(nl2[i2]); nl2[i2] = 0; 474 } else if (i < 0) { 475 /* Something extra in list 1, delete it */ |
476 Del(dir1, dir2, name, nl1[i1]); |
477 free(nl1[i1]); nl1[i1] = 0; 478 } else { 479 /* Something extra in list 2, add it */ |
480 Add(dir1, dir2, name, nl2[i2]); |
481 free(nl2[i2]); nl2[i2] = 0; 482 } 483 } 484 if (n1 >= 0) 485 free(nl1); 486 if (n2 >= 0) 487 free(nl2); 488} 489 490int 491main(int argc, char **argv) 492{ 493 int i; 494 extern char *optarg; 495 extern int optind; 496 497 setbuf(stderr, NULL); 498 |
499#if 0 500 if (regcomp(®_bogus, DEFAULT_BOGUS, REG_EXTENDED | REG_NEWLINE)) |
501 /* XXX use regerror to explain it */ |
502 errx(1, "Default regular expression argument to -B is botched"); |
503 flag_bogus = 1; 504 |
505 if (regcomp(®_ignore, DEFAULT_IGNORE, REG_EXTENDED | REG_NEWLINE)) |
506 /* XXX use regerror to explain it */ |
507 errx(1, "Default regular expression argument to -I is botched"); |
508 flag_ignore = 1; |
509#endif |
510 |
511 while ((i = getopt(argc, argv, "D:I:B:l:qv")) != EOF) |
512 switch (i) { 513 case 'D': |
514 damage_limit = strtol(optarg, 0, 0); |
515 if (damage_limit < 0) |
516 errx(1, "Damage limit must be positive"); |
517 break; 518 case 'I': 519 if (flag_ignore) 520 regfree(®_ignore); 521 flag_ignore = 0; 522 if (!*optarg) 523 break; |
524 if (regcomp(®_ignore, optarg, |
525 REG_EXTENDED | REG_NEWLINE)) 526 /* XXX use regerror to explain it */ |
527 errx(1, "Regular expression argument to -I is botched"); |
528 flag_ignore = 1; 529 break; 530 case 'B': 531 if (flag_bogus) 532 regfree(®_bogus); 533 flag_bogus = 0; 534 if (!*optarg) 535 break; |
536 if (regcomp(®_bogus, optarg, |
537 REG_EXTENDED | REG_NEWLINE)) 538 /* XXX use regerror to explain it */ |
539 errx(1, "Regular expression argument to -B is botched"); |
540 flag_bogus = 1; 541 break; |
542 case 'l': 543 logf = fopen(optarg, "w"); 544 if (!logf) 545 err(1, optarg); 546 break; |
547 case 'q': 548 verbose--; 549 break; 550 case 'v': 551 verbose++; 552 break; 553 case '?': 554 default: 555 Usage(); 556 return (1); 557 } 558 argc -= optind; 559 argv += optind; 560 |
561 if (!logf) 562 logf = fopen("/dev/null", "w"); |
563 |
564 setbuf(stdout, 0); 565 |
566 if (argc != 6) { 567 Usage(); 568 return (1); 569 } 570 |
571 signal(SIGINFO, stat_info); |
572 |
573 fprintf(stderr, "CTM_BEGIN 2.0 %s %s %s %s\n", 574 argv[0], argv[1], argv[2], argv[3]); 575 fprintf(logf, "CTM_BEGIN 2.0 %s %s %s %s\n", 576 argv[0], argv[1], argv[2], argv[3]); |
577 printf("CTM_BEGIN 2.0 %s %s %s %s\n", 578 argv[0], argv[1], argv[2], argv[3]); |
579 DoDir(argv[4], argv[5], ""); |
580 if (damage_limit && damage > damage_limit) { |
581 print_stat(stderr, "DAMAGE: "); 582 errx(1, "Damage of %d would exceed %d files", 583 damage, damage_limit); 584 } else if (change < 2) { 585 errx(1, "No changes"); |
586 } else { 587 printf("CTM_END "); |
588 fprintf(logf, "CTM_END\n"); 589 print_stat(stderr, "END: "); |
590 } 591 exit(0); 592} |