diff options
author | sobomax <sobomax@FreeBSD.org> | 2001-08-02 12:38:29 +0000 |
---|---|---|
committer | sobomax <sobomax@FreeBSD.org> | 2001-08-02 12:38:29 +0000 |
commit | fd136a35b7dd890f7e0311529a85fb68a1a77d13 (patch) | |
tree | e0c4b81d815e2f6178ad7197381d4118747ff56d /usr.sbin/pkg_install/delete | |
parent | a9479014c3acf16862bef0f26b143ab5a3e45eeb (diff) | |
download | FreeBSD-src-fd136a35b7dd890f7e0311529a85fb68a1a77d13.zip FreeBSD-src-fd136a35b7dd890f7e0311529a85fb68a1a77d13.tar.gz |
Usability tweak:
Use '' quotes instead of `' to delimit names of files and packages in
warning and error messages, because it is easier to cut-n-paste name in
question that way (single click) without confusing the shell. And yes,
I know that it is less eye-candy...
MFC after: 1 month
Diffstat (limited to 'usr.sbin/pkg_install/delete')
-rw-r--r-- | usr.sbin/pkg_install/delete/perform.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c index 3a9ec87..4469299 100644 --- a/usr.sbin/pkg_install/delete/perform.c +++ b/usr.sbin/pkg_install/delete/perform.c @@ -130,7 +130,7 @@ pkg_do(char *pkg) if (!isemptyfile(REQUIRED_BY_FNAME)) { char buf[512]; - warnx("package `%s' is required by these other packages\n" + warnx("package '%s' is required by these other packages\n" "and may not be deinstalled%s:", pkg, Force ? " (but I'll delete it anyway)" : "" ); cfile = fopen(REQUIRED_BY_FNAME, "r"); @@ -139,7 +139,7 @@ pkg_do(char *pkg) fprintf(stderr, "%s", buf); fclose(cfile); } else - warnx("cannot open requirements file `%s'", REQUIRED_BY_FNAME); + warnx("cannot open requirements file '%s'", REQUIRED_BY_FNAME); if (!Force) return 1; } @@ -258,7 +258,7 @@ pkg_do(char *pkg) if (p->type != PLIST_PKGDEP) continue; if (Verbose) - printf("Attempting to remove dependency on package `%s'\n", p->name); + printf("Attempting to remove dependency on package '%s'\n", p->name); if (!Fake) undepend(p, pkg); } @@ -295,21 +295,21 @@ undepend(PackingList p, char *pkgname) p->name, REQUIRED_BY_FNAME); fp = fopen(fname, "r"); if (fp == NULL) { - warnx("couldn't open dependency file `%s'", fname); + warnx("couldn't open dependency file '%s'", fname); return; } sprintf(ftmp, "%s.XXXXXX", fname); s = mkstemp(ftmp); if (s == -1) { fclose(fp); - warnx("couldn't open temp file `%s'", ftmp); + warnx("couldn't open temp file '%s'", ftmp); return; } fpwr = fdopen(s, "w"); if (fpwr == NULL) { close(s); fclose(fp); - warnx("couldn't fdopen temp file `%s'", ftmp); + warnx("couldn't fdopen temp file '%s'", ftmp); remove(ftmp); return; } @@ -321,18 +321,18 @@ undepend(PackingList p, char *pkgname) } (void) fclose(fp); if (fchmod(s, 0644) == FAIL) { - warnx("error changing permission of temp file `%s'", ftmp); + warnx("error changing permission of temp file '%s'", ftmp); fclose(fpwr); remove(ftmp); return; } if (fclose(fpwr) == EOF) { - warnx("error closing temp file `%s'", ftmp); + warnx("error closing temp file '%s'", ftmp); remove(ftmp); return; } if (rename(ftmp, fname) == -1) - warnx("error renaming `%s' to `%s'", ftmp, fname); + warnx("error renaming '%s' to '%s'", ftmp, fname); remove(ftmp); /* just in case */ return; } |