Changeset 4463 for trunk/base
- Timestamp:
- Jan 5, 2004, 11:57:59 AM (20 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/base/src/pextlib1.0/xinstall.c
r4383 r4463 85 85 static const char *suffix = BACKUP_SUFFIX; 86 86 static char *funcname; 87 static int safecopy, docompare, dostrip, dobackup, dopreserve, nommap , verbose;87 static int safecopy, docompare, dostrip, dobackup, dopreserve, nommap; 88 88 static mode_t mode; 89 89 … … 116 116 suffix = BACKUP_SUFFIX; 117 117 mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; 118 safecopy = docompare = dostrip = dobackup = dopreserve = nommap = verbose =0;118 safecopy = docompare = dostrip = dobackup = dopreserve = nommap = 0; 119 119 iflags = 0; 120 120 group = owner = curdir = NULL; … … 216 216 break; 217 217 case 'v': 218 verbose = 1;218 /* provided only for compatibility with install(1) */ 219 219 objv++, objc--; 220 220 break; … … 253 253 safecopy = 1; 254 254 255 /* If overall ports verbosity is turned on, enable this too */256 cp = Tcl_GetVar2(interp, "ui_options", "ports_verbose", 0);257 if (cp && !strcmp(cp, "yes"))258 verbose = 1;259 260 255 /* Start out hoping for the best */ 261 256 rval = TCL_OK; … … 270 265 return TCL_ERROR; 271 266 } 272 else if (verbose){267 else { 273 268 char msg[255]; 274 269 275 snprintf(msg, sizeof msg, "%s: chdir(%s)\n", 276 funcname, curdir); 270 snprintf(msg, sizeof msg, "%s: chdir(%s)\n", funcname, curdir); 277 271 ui_info(interp, msg); 278 272 } … … 400 394 int tempcopy, temp_fd, to_fd = 0; 401 395 char backup[MAXPATHLEN], *p, pathbuf[MAXPATHLEN], tempfile[MAXPATHLEN]; 396 char msg[256]; 402 397 403 398 files_match = 0; … … 502 497 return TCL_ERROR; 503 498 } 504 if (verbose) { 505 char msg[255]; 506 507 snprintf(msg, sizeof msg, "%s: %s -> %s\n", funcname, from_name, to_name); 508 ui_info(interp, msg); 509 } 499 snprintf(msg, sizeof msg, "%s: %s -> %s\n", funcname, from_name, to_name); 500 ui_info(interp, msg); 510 501 } 511 502 if (!devnull) … … 602 593 return TCL_ERROR; 603 594 } 604 if (verbose) { 605 char msg[255]; 606 607 snprintf(msg, sizeof msg, "%s: %s -> %s\n", funcname, to_name, backup); 608 ui_info(interp, msg); 609 } 595 snprintf(msg, sizeof msg, "%s: %s -> %s\n", funcname, to_name, backup); 596 ui_info(interp, msg); 610 597 if (rename(to_name, backup) < 0) { 611 598 char errmsg[255]; … … 620 607 } 621 608 } 622 if (verbose) { 623 char msg[255]; 624 625 snprintf(msg, sizeof msg, "%s: %s -> %s\n", funcname, from_name, to_name); 626 ui_info(interp, msg); 627 } 609 snprintf(msg, sizeof msg, "%s: %s -> %s\n", funcname, from_name, to_name); 610 ui_info(interp, msg); 628 611 if (rename(tempfile, to_name) < 0) { 629 612 char errmsg[255]; … … 838 821 int saved_errno = 0; 839 822 int newfd; 823 char msg[256]; 840 824 841 825 if (target) { … … 859 843 } 860 844 (void)snprintf(backup, MAXPATHLEN, "%s%s", path, suffix); 861 if (verbose) { 862 char msg[255]; 863 864 snprintf(msg, sizeof msg, "%s: %s -> %s\n", funcname, path, backup); 865 ui_info(interp, msg); 866 } 845 snprintf(msg, sizeof msg, "%s: %s -> %s\n", funcname, path, backup); 846 ui_info(interp, msg); 867 847 if (rename(path, backup) < 0) { 868 848 char errmsg[255]; … … 1019 999 Tcl_SetResult(interp, errmsg, TCL_VOLATILE); 1020 1000 return TCL_ERROR; 1021 } else if (verbose) { 1001 } 1002 else { 1022 1003 char msg[255]; 1023 1004
Note: See TracChangeset
for help on using the changeset viewer.