summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authornjl <njl@FreeBSD.org>2007-03-28 05:33:52 +0000
committernjl <njl@FreeBSD.org>2007-03-28 05:33:52 +0000
commitd7602774b516e75f375c5127f4cca86337d9add6 (patch)
treeefb927000e27bf6efe3b1403d56eb29739d92e52 /usr.sbin
parent95fe219a6add0253d4bf5a400e67f67cf85f12ef (diff)
downloadFreeBSD-src-d7602774b516e75f375c5127f4cca86337d9add6.zip
FreeBSD-src-d7602774b516e75f375c5127f4cca86337d9add6.tar.gz
Make consistent with style(msmith). 4 spaces indent, tab for each 2 indents.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pkg_install/lib/exec.c4
-rw-r--r--usr.sbin/pkg_install/lib/lib.h2
-rw-r--r--usr.sbin/pkg_install/lib/plist.c2
-rw-r--r--usr.sbin/pkg_install/lib/url.c6
4 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/pkg_install/lib/exec.c b/usr.sbin/pkg_install/lib/exec.c
index 86285fb..fc8220c 100644
--- a/usr.sbin/pkg_install/lib/exec.c
+++ b/usr.sbin/pkg_install/lib/exec.c
@@ -68,8 +68,8 @@ vpipe(const char *fmt, ...)
rp = malloc(MAXPATHLEN);
if (!rp) {
- warnx("vpipe can't alloc buffer space");
- return NULL;
+ warnx("vpipe can't alloc buffer space");
+ return NULL;
}
maxargs = sysconf(_SC_ARG_MAX);
maxargs -= 32; /* some slop for the sh -c */
diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h
index 933af38..5cda81f 100644
--- a/usr.sbin/pkg_install/lib/lib.h
+++ b/usr.sbin/pkg_install/lib/lib.h
@@ -170,7 +170,7 @@ Boolean fexists(const char *);
Boolean isdir(const char *);
Boolean isemptydir(const char *fname);
Boolean isemptyfile(const char *fname);
-Boolean isfile(const char *);
+Boolean isfile(const char *);
Boolean isempty(const char *);
Boolean issymlink(const char *);
Boolean isURL(const char *);
diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c
index 11e9d13..283b87f 100644
--- a/usr.sbin/pkg_install/lib/plist.c
+++ b/usr.sbin/pkg_install/lib/plist.c
@@ -480,7 +480,7 @@ delete_package(Boolean ign_err, Boolean nukedirs, Package *pkg)
/* Mismatch? */
if (strcmp(cp, p->next->name + 4)) {
warnx("'%s' fails original MD5 checksum - %s",
- tmp, Force ? "deleted anyway." : "not deleted.");
+ tmp, Force ? "deleted anyway." : "not deleted.");
if (!Force) {
fail = FAIL;
continue;
diff --git a/usr.sbin/pkg_install/lib/url.c b/usr.sbin/pkg_install/lib/url.c
index d01b116..29e9beb 100644
--- a/usr.sbin/pkg_install/lib/url.c
+++ b/usr.sbin/pkg_install/lib/url.c
@@ -99,13 +99,13 @@ fileGetURL(const char *base, const char *spec, int keep_package)
strcpy(fname, spec);
if (keep_package) {
- tmp = getenv("PKGDIR");
+ tmp = getenv("PKGDIR");
strlcpy(pkg, tmp ? tmp : ".", sizeof(pkg));
tmp = basename(fname);
strlcat(pkg, "/", sizeof(pkg));
strlcat(pkg, tmp, sizeof(pkg));
- if ((pkgfd = open(pkg, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1) {
- printf("Error: Unable to open %s\n", pkg);
+ if ((pkgfd = open(pkg, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1) {
+ printf("Error: Unable to open %s\n", pkg);
perror("open");
return NULL;
}
OpenPOWER on IntegriCloud