diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2005-06-14 18:35:58 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2005-06-14 18:35:58 +0000 |
| commit | 7cc0d42200db3b208540494410acd97bb95752ab (patch) | |
| tree | 30353ad831ac3e3266658f5d7770ce628cfd1113 /src | |
| parent | f7bbc5d1a2175ca6a2a964aeec964832a920959f (diff) | |
| download | coreutils-7cc0d42200db3b208540494410acd97bb95752ab.tar.xz | |
(main): Adjust to new make_dir_parents convention.
Diffstat (limited to 'src')
| -rw-r--r-- | src/install.c | 4 | ||||
| -rw-r--r-- | src/mkdir.c | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/install.c b/src/install.c index 0dc5f1dd2..5567f1f65 100644 --- a/src/install.c +++ b/src/install.c @@ -360,7 +360,6 @@ main (int argc, char **argv) bool cwd_not_restored = false; for (i = 0; i < n_files; i++) { - bool different_cwd; if (cwd_not_restored && IS_RELATIVE_FILE_NAME (argv[optind])) { error (0, 0, @@ -374,8 +373,7 @@ main (int argc, char **argv) ok &= make_dir_parents (file[i], mode, mode, owner_id, group_id, false, (x.verbose ? _("creating directory %s") : NULL), - &different_cwd); - cwd_not_restored |= different_cwd; + &cwd_not_restored); } } else diff --git a/src/mkdir.c b/src/mkdir.c index 5fce2ce4d..7fbf52598 100644 --- a/src/mkdir.c +++ b/src/mkdir.c @@ -87,7 +87,7 @@ main (int argc, char **argv) const char *verbose_fmt_string = NULL; int exit_status = EXIT_SUCCESS; int optc; - bool cwd_not_restored; + bool cwd_not_restored = false; initialize_main (&argc, &argv); program_name = argv[0]; @@ -146,8 +146,6 @@ main (int argc, char **argv) umask (umask_value); } - /* FIXME: when we assume C99, declare this here. */ - cwd_not_restored = false; for (; optind < argc; ++optind) { bool ok; @@ -163,12 +161,10 @@ main (int argc, char **argv) if (create_parents) { - bool different_cwd; char *dir = argv[optind]; ok = make_dir_parents (dir, newmode, parent_mode, -1, -1, true, verbose_fmt_string, - &different_cwd); - cwd_not_restored |= different_cwd; + &cwd_not_restored); } else { |