diff options
author | dim <dim@FreeBSD.org> | 2015-02-14 13:12:03 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2015-02-14 13:12:03 +0000 |
commit | ff34755926ad8a77e4498e82a23c847d33c6c72d (patch) | |
tree | 32512087a8fc0e78759068f074dd1fcac39ef5c9 /usr.bin | |
parent | 3b7b68ffe74f0538bae62b7a4ba4e448156b9542 (diff) | |
parent | 1cd0dffdca6542739e3aa4c7e5221f0b28d076c4 (diff) | |
download | FreeBSD-src-ff34755926ad8a77e4498e82a23c847d33c6c72d.zip FreeBSD-src-ff34755926ad8a77e4498e82a23c847d33c6c72d.tar.gz |
Merge ^/head r278499 through r278755.
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/svn/svn/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/w/w.c | 4 | ||||
-rw-r--r-- | usr.bin/wc/wc.c | 4 | ||||
-rw-r--r-- | usr.bin/whereis/pathnames.h | 3 | ||||
-rw-r--r-- | usr.bin/whereis/whereis.1 | 3 | ||||
-rw-r--r-- | usr.bin/whereis/whereis.c | 5 |
6 files changed, 11 insertions, 10 deletions
diff --git a/usr.bin/svn/svn/Makefile b/usr.bin/svn/svn/Makefile index cdac81d..b4f76f5 100644 --- a/usr.bin/svn/svn/Makefile +++ b/usr.bin/svn/svn/Makefile @@ -54,7 +54,7 @@ DPSRCS+= freebsd-organization.h CLEANFILES+= freebsd-organization.h CFLAGS+= -I. -DHAS_ORGANIZATION_NAME freebsd-organization.h: - @echo '#define ORGANIZATION_NAME ${ORGANIZATION}' \ + @echo "#define ORGANIZATION_NAME \"$$(eval echo ${ORGANIZATION})\"" \ > freebsd-organization.h .endif diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c index effd0e3..0889c4c 100644 --- a/usr.bin/w/w.c +++ b/usr.bin/w/w.c @@ -264,7 +264,9 @@ main(int argc, char *argv[]) if (header || wcmd == 0) { pr_header(&now, nusers); if (wcmd == 0) { - xo_close_container("uptime-information"); + xo_close_container("uptime-information"); + xo_finish(); + (void)kvm_close(kd); exit(0); } diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c index 79ac4a0..9d51ab2 100644 --- a/usr.bin/wc/wc.c +++ b/usr.bin/wc/wc.c @@ -140,12 +140,14 @@ main(int argc, char *argv[]) } while(*++argv); } + xo_close_list("file"); + if (total > 1) { xo_open_container("total"); show_cnt("total", tlinect, twordct, tcharct, tlongline); xo_close_container("total"); } - xo_close_list("file"); + xo_close_container("wc"); xo_finish(); exit(errors == 0 ? 0 : 1); diff --git a/usr.bin/whereis/pathnames.h b/usr.bin/whereis/pathnames.h index 1668d90..f5d27d1 100644 --- a/usr.bin/whereis/pathnames.h +++ b/usr.bin/whereis/pathnames.h @@ -25,9 +25,8 @@ * $FreeBSD$ */ -/* Where to look for libexec and games */ +/* Where to look for libexec */ #define PATH_LIBEXEC "/usr/libexec" -#define PATH_GAMES "/usr/games" /* Where to look for sources. */ #define PATH_SOURCES \ diff --git a/usr.bin/whereis/whereis.1 b/usr.bin/whereis/whereis.1 index a5b2899..e72911c 100644 --- a/usr.bin/whereis/whereis.1 +++ b/usr.bin/whereis/whereis.1 @@ -65,8 +65,7 @@ The default path searched is the string returned by the utility for the .Dq user.cs_path string, with -.Pa /usr/libexec , -.Pa /usr/games +.Pa /usr/libexec and the current user's .Ev $PATH appended. diff --git a/usr.bin/whereis/whereis.c b/usr.bin/whereis/whereis.c index 401461f..ed8d93a 100644 --- a/usr.bin/whereis/whereis.c +++ b/usr.bin/whereis/whereis.c @@ -265,7 +265,7 @@ defaults(void) opt_b = opt_m = opt_s = 1; /* -b defaults to default path + /usr/libexec + - * /usr/games + user's path */ + * user's path */ if (!bindirs) { if (sysctlbyname("user.cs_path", (void *)NULL, &s, (void *)NULL, 0) == -1) @@ -276,11 +276,10 @@ defaults(void) err(EX_OSERR, "sysctlbyname(\"user.cs_path\")"); nele = 0; decolonify(b, &bindirs, &nele); - bindirs = realloc(bindirs, (nele + 3) * sizeof(char *)); + bindirs = realloc(bindirs, (nele + 2) * sizeof(char *)); if (bindirs == NULL) abort(); bindirs[nele++] = PATH_LIBEXEC; - bindirs[nele++] = PATH_GAMES; bindirs[nele] = NULL; if ((cp = getenv("PATH")) != NULL) { /* don't destroy the original environment... */ |