summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr/src/Makefile.lint12
-rw-r--r--usr/src/ucbcmd/basename/basename.c22
-rw-r--r--usr/src/ucbcmd/biff/biff.c32
-rw-r--r--usr/src/ucbcmd/echo/echo.c13
-rw-r--r--usr/src/ucbcmd/groups/groups.c59
-rw-r--r--usr/src/ucbcmd/mkstr/mkstr.c117
-rw-r--r--usr/src/ucbcmd/printenv/printenv.c4
-rw-r--r--usr/src/ucbcmd/sum/sum.c24
-rw-r--r--usr/src/ucbcmd/test/test.c257
-rw-r--r--usr/src/ucbcmd/users/users.c47
-rw-r--r--usr/src/ucbcmd/whoami/whoami.c6
11 files changed, 318 insertions, 275 deletions
diff --git a/usr/src/Makefile.lint b/usr/src/Makefile.lint
index 3323edf508..df672c178a 100644
--- a/usr/src/Makefile.lint
+++ b/usr/src/Makefile.lint
@@ -347,7 +347,17 @@ COMMON_SUBDIRS = \
lib/smartcard \
lib/fm \
lib/udapl \
- psm
+ psm \
+ ucbcmd/basename \
+ ucbcmd/biff \
+ ucbcmd/echo \
+ ucbcmd/groups \
+ ucbcmd/mkstr \
+ ucbcmd/printenv \
+ ucbcmd/sum \
+ ucbcmd/test \
+ ucbcmd/users \
+ ucbcmd/whoami
i386_SUBDIRS= \
cmd/biosdev \
diff --git a/usr/src/ucbcmd/basename/basename.c b/usr/src/ucbcmd/basename/basename.c
index 382b36d65f..d5a024ac12 100644
--- a/usr/src/ucbcmd/basename/basename.c
+++ b/usr/src/ucbcmd/basename/basename.c
@@ -15,7 +15,8 @@
#pragma ident "%Z%%M% %I% %E% SMI"
-#include <stdio.h>
+#include <stdio.h>
+#include <stdlib.h>
int
main(int argc, char **argv)
@@ -23,7 +24,7 @@ main(int argc, char **argv)
char *p1, *p2, *p3;
if (argc < 2) {
- (void)putchar('\n');
+ (void) putchar('\n');
exit(1);
}
p1 = argv[1];
@@ -32,16 +33,19 @@ main(int argc, char **argv)
if (*p1++ == '/')
p2 = p1;
}
- if (argc>2) {
- for(p3=argv[2]; *p3; p3++)
- ;
- while(p3>argv[2])
- if(p1 <= p2 || *--p3 != *--p1)
+ if (argc > 2) {
+ p3 = argv[2];
+ while (*p3)
+ p3++;
+
+ while (p3 > argv[2])
+ if (p1 <= p2 || *--p3 != *--p1)
goto output;
*p1 = '\0';
}
output:
- fputs(p2, stdout);
- putc('\n', stdout);
+
+ (void) fputs(p2, stdout);
+ (void) putc('\n', stdout);
return (0);
}
diff --git a/usr/src/ucbcmd/biff/biff.c b/usr/src/ucbcmd/biff/biff.c
index 73d2386af0..56876b2575 100644
--- a/usr/src/ucbcmd/biff/biff.c
+++ b/usr/src/ucbcmd/biff/biff.c
@@ -19,8 +19,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 1989 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -43,16 +44,15 @@
* biff
*/
+#include <stdlib.h>
+#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
#include <locale.h>
-char *ttyname();
-
-main(argc, argv)
- int argc;
- char **argv;
+int
+main(int argc, char **argv)
{
char *cp = ttyname(2);
struct stat stb;
@@ -60,17 +60,23 @@ main(argc, argv)
(void) setlocale(LC_ALL, "");
#if !defined(TEXT_DOMAIN)
-#define TEXT_DOMAIN "SYS_TEST"
+#define TEXT_DOMAIN "SYS_TEST"
#endif
(void) textdomain(TEXT_DOMAIN);
argc--, argv++;
- if (cp == 0)
- fprintf(stderr, gettext("biff failed: cannot locate your tty: ttyname() for file descriptor 2 returned NULL\n")), exit(1);
+ if (cp == 0) {
+ (void) fprintf(stderr,
+ gettext("biff failed: cannot locate your tty: "
+ "ttyname() for file descriptor 2 returned"
+ " NULL\n"));
+ exit(1);
+ }
if (stat(cp, &stb) < 0)
perror(cp), exit(1);
if (argc == 0) {
- printf("is %s\n", stb.st_mode&0100 ? gettext("y") : gettext("n"));
+ (void) printf("is %s\n",
+ stb.st_mode&0100 ? gettext("y") : gettext("n"));
exit((stb.st_mode&0100) ? 0 : 1);
}
switch (argv[0][0]) {
@@ -86,9 +92,7 @@ main(argc, argv)
break;
default:
- fprintf(stderr, gettext("usage: biff [y] [n]\n"));
+ (void) fprintf(stderr, gettext("usage: biff [y] [n]\n"));
}
- exit((stb.st_mode&0100) ? 0 : 1);
- /* NOTREACHED */
+ return ((stb.st_mode&0100) ? 0 : 1);
}
-
diff --git a/usr/src/ucbcmd/echo/echo.c b/usr/src/ucbcmd/echo/echo.c
index b2499b7636..ddf34a781b 100644
--- a/usr/src/ucbcmd/echo/echo.c
+++ b/usr/src/ucbcmd/echo/echo.c
@@ -26,17 +26,18 @@ main(int argc, char *argv[])
int i, nflg;
nflg = 0;
- if(argc > 1 && argv[1][0] == '-' && argv[1][1] == 'n' && !argv[1][2]) {
+ if (argc > 1 && argv[1][0] == '-' && argv[1][1] == 'n' && !argv[1][2]) {
nflg++;
argc--;
argv++;
}
- for(i=1; i<argc; i++) {
- fputs(argv[i], stdout);
+ for (i = 1; i < argc; i++) {
+ (void) fputs(argv[i], stdout);
if (i < argc-1)
- putchar(' ');
+ (void) putchar(' ');
}
- if(nflg == 0)
- putchar('\n');
+
+ if (nflg == 0)
+ (void) putchar('\n');
return (0);
}
diff --git a/usr/src/ucbcmd/groups/groups.c b/usr/src/ucbcmd/groups/groups.c
index f2e6317b45..d010c96010 100644
--- a/usr/src/ucbcmd/groups/groups.c
+++ b/usr/src/ucbcmd/groups/groups.c
@@ -19,83 +19,86 @@
* groups
*/
+#include <sys/types.h>
#include <sys/param.h>
#include <grp.h>
#include <pwd.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
-static void showgroups(char *);
-
-int groups[NGROUPS_UMAX];
+static void showgroups(char *user);
int
main(int argc, char *argv[])
{
- int ngroups, i, j;
+ int ngroups, i;
char *sep = "";
struct group *gr;
- struct passwd *pw;
+ gid_t groups[NGROUPS_UMAX];
if (argc > 1) {
- for (i=1; i < argc ; i++)
- showgroups(argv[i]);
- exit(0) ;
+ for (i = 1; i < argc; i++)
+ showgroups(argv[i]);
+ exit(0);
}
ngroups = getgroups(NGROUPS_UMAX, groups);
- if ((pw = getpwuid(getuid())) == NULL) {
- fprintf(stderr, "groups: could not find passwd entry\n");
+ if (getpwuid(getuid()) == NULL) {
+ (void) fprintf(stderr, "groups: could not find passwd entry\n");
exit(1);
}
for (i = 0; i < ngroups; i++) {
gr = getgrgid(groups[i]);
if (gr == NULL) {
- printf("%s%d", sep, groups[i]);
+ (void) printf("%s%ld", sep, groups[i]);
sep = " ";
continue;
}
- printf("%s%s", sep, gr->gr_name);
+ (void) printf("%s%s", sep, gr->gr_name);
sep = " ";
}
- printf("\n");
+
+ (void) printf("\n");
return (0);
}
-void
+static void
showgroups(char *user)
{
struct group *gr;
struct passwd *pw;
char **cp;
char *sep = "";
- int pwgid_printed = 0 ;
+ int pwgid_printed = 0;
if ((pw = getpwnam(user)) == NULL) {
- fprintf(stderr, "groups: %s : No such user\n", user);
+ (void) fprintf(stderr, "groups: %s : No such user\n", user);
return;
}
- setgrent() ;
- printf("%s : ", user) ;
+ setgrent();
+ (void) printf("%s : ", user);
while (gr = getgrent()) {
if (pw->pw_gid == gr->gr_gid) {
- /*
- * To avoid duplicate group entries
+ /*
+ * To avoid duplicate group entries
*/
- if (pwgid_printed==0) {
- printf("%s%s", sep, gr->gr_name);
+ if (pwgid_printed == 0) {
+ (void) printf("%s%s", sep, gr->gr_name);
sep = " ";
- pwgid_printed = 1 ;
+ pwgid_printed = 1;
}
- continue ;
- }
+ continue;
+ }
for (cp = gr->gr_mem; cp && *cp; cp++)
if (strcmp(*cp, user) == 0) {
- printf("%s%s", sep, gr->gr_name);
+ (void) printf("%s%s", sep, gr->gr_name);
sep = " ";
break;
}
}
- printf("\n");
- endgrent() ;
+ (void) printf("\n");
+ endgrent();
}
diff --git a/usr/src/ucbcmd/mkstr/mkstr.c b/usr/src/ucbcmd/mkstr/mkstr.c
index 07935b14c9..7dfbdbf0f2 100644
--- a/usr/src/ucbcmd/mkstr/mkstr.c
+++ b/usr/src/ucbcmd/mkstr/mkstr.c
@@ -21,7 +21,7 @@
*/
/*
- * Copyright 1992 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -54,33 +54,39 @@
*/
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <locale.h>
+#include <sys/param.h>
#define ungetchar(c) ungetc(c, stdin)
-long ftell();
-char *calloc();
+#define NBUCKETS 511
+
+static char usagestr[] = "usage: %s [ - ] mesgfile prefix file ...\n";
-FILE *mesgread, *mesgwrite;
-char *progname;
-char usagestr[] = "usage: %s [ - ] mesgfile prefix file ...\n";
-char name[100], *np;
+static FILE *mesgread, *mesgwrite;
-int hashit(char *str, char really, unsigned int fakept);
-void process(void);
-void inithash(void);
-int octdigit(char c);
-void copystr(void);
+static void process(void);
+static int match(char *ocp);
+static void copystr(void);
+static int octdigit(char c);
+static void inithash(void);
+static int hashit(char *str, char really, unsigned int fakept);
+static int fgetNUL(char *obuf, int rmdr, FILE *file);
int
main(int argc, char *argv[])
{
char addon = 0;
+ char *progname, *np, name[MAXPATHLEN];
+ size_t size = 0;
+ size_t len;
(void) setlocale(LC_ALL, "");
#if !defined(TEXT_DOMAIN)
-#define TEXT_DOMAIN "SYS_TEST"
+#define TEXT_DOMAIN "SYS_TEST"
#endif
(void) textdomain(TEXT_DOMAIN);
@@ -88,7 +94,7 @@ main(int argc, char *argv[])
if (argc > 1 && argv[0][0] == '-')
addon++, argc--, argv++;
if (argc < 3)
- fprintf(stderr, gettext(usagestr), progname), exit(1);
+ (void) fprintf(stderr, gettext(usagestr), progname), exit(1);
mesgwrite = fopen(argv[0], addon ? "a" : "w");
if (mesgwrite == NULL)
perror(argv[0]), exit(1);
@@ -97,11 +103,26 @@ main(int argc, char *argv[])
perror(argv[0]), exit(1);
inithash();
argc--, argv++;
- strcpy(name, argv[0]);
+
+ if (strlcpy(name, argv[0], sizeof (name)) >= sizeof (name)) {
+ (void) fprintf(stderr, gettext("%s: %s: string too long"),
+ progname, argv[0]);
+ exit(1);
+ }
+
np = name + strlen(name);
+
+ len = strlen(name);
+ np = name + len;
+ size = sizeof (name) - len;
argc--, argv++;
do {
- strcpy(np, argv[0]);
+ if (strlcpy(np, argv[0], size) >= size) {
+ (void) fprintf(stderr,
+ gettext("%s: %s: string too long"),
+ progname, argv[0]);
+ exit(1);
+ }
if (freopen(name, "w", stdout) == NULL)
perror(name), exit(1);
if (freopen(argv[0], "r", stdin) == NULL)
@@ -109,13 +130,13 @@ main(int argc, char *argv[])
process();
argc--, argv++;
} while (argc > 0);
+
return (0);
}
-void
+static void
process(void)
{
- char *cp;
int c;
for (;;) {
@@ -123,21 +144,21 @@ process(void)
if (c == EOF)
return;
if (c != 'e') {
- putchar(c);
+ (void) putchar(c);
continue;
}
if (match("error(")) {
- printf(gettext("error("));
+ (void) printf(gettext("error("));
c = getchar();
if (c != '"')
- putchar(c);
+ (void) putchar(c);
else
copystr();
}
}
}
-int
+static int
match(char *ocp)
{
char *cp;
@@ -147,15 +168,15 @@ match(char *ocp)
c = getchar();
if (c != *cp) {
while (ocp < cp)
- putchar(*ocp++);
- ungetchar(c);
+ (void) putchar(*ocp++);
+ (void) ungetchar(c);
return (0);
}
}
return (1);
}
-void
+static void
copystr(void)
{
int c, ch;
@@ -208,7 +229,7 @@ copystr(void)
ch = getchar();
if (!octdigit(ch))
break;
- c <<= 3, c+= ch - '0', ch = -1;
+ c <<= 3, c += ch - '0', ch = -1;
break;
}
}
@@ -216,38 +237,36 @@ copystr(void)
}
out:
*cp = 0;
- printf("%d", hashit(buf, 1, NULL));
+ (void) printf("%d", hashit(buf, 1, NULL));
}
-int
+static int
octdigit(char c)
{
return (c >= '0' && c <= '7');
}
-void
+static void
inithash(void)
{
char buf[512];
int mesgpt = 0;
rewind(mesgread);
- while (fgetNUL(buf, sizeof buf, mesgread) != NULL) {
- hashit(buf, 0, mesgpt);
+ while (fgetNUL(buf, sizeof (buf), mesgread) != NULL) {
+ (void) hashit(buf, 0, mesgpt);
mesgpt += strlen(buf) + 2;
}
}
-#define NBUCKETS 511
-
-struct hash {
+static struct hash {
long hval;
unsigned int hpt;
struct hash *hnext;
} *bucket[NBUCKETS];
-int
+static int
hashit(char *str, char really, unsigned int fakept)
{
int i;
@@ -257,8 +276,8 @@ hashit(char *str, char really, unsigned int fakept)
char *cp;
if (really)
- fflush(mesgwrite);
- for (cp = str; *cp;)
+ (void) fflush(mesgwrite);
+ for (cp = str; *cp; )
hashval = (hashval << 1) + *cp++;
i = hashval % NBUCKETS;
if (i < 0)
@@ -266,35 +285,27 @@ hashit(char *str, char really, unsigned int fakept)
if (really != 0)
for (hp = bucket[i]; hp != 0; hp = hp->hnext)
if (hp->hval == hashval) {
- fseek(mesgread, (long) hp->hpt, 0);
- fgetNUL(buf, sizeof buf, mesgread);
-/*
- fprintf(stderr, gettext("Got (from %d) %s\n"), hp->hpt, buf);
-*/
+ (void) fseek(mesgread, (long)hp->hpt, 0);
+ (void) fgetNUL(buf, sizeof (buf), mesgread);
if (strcmp(buf, str) == 0)
break;
}
if (!really || hp == 0) {
- hp = (struct hash *) calloc(1, sizeof *hp);
+ hp = (struct hash *)calloc(1, sizeof (*hp));
hp->hnext = bucket[i];
hp->hval = hashval;
hp->hpt = really ? ftell(mesgwrite) : fakept;
if (really) {
- fwrite(str, sizeof (char), strlen(str) + 1, mesgwrite);
- fwrite("\n", sizeof (char), 1, mesgwrite);
+ (void) fwrite(str, sizeof (char), strlen(str) + 1,
+ mesgwrite);
+ (void) fwrite("\n", sizeof (char), 1, mesgwrite);
}
bucket[i] = hp;
}
-/*
- fprintf(stderr, gettext("%s hashed to %ld at %d\n"), str, hp->hval, hp->hpt);
-*/
return (hp->hpt);
}
-#include <sys/types.h>
-#include <sys/stat.h>
-
-int
+static int
fgetNUL(char *obuf, int rmdr, FILE *file)
{
int c;
@@ -303,6 +314,6 @@ fgetNUL(char *obuf, int rmdr, FILE *file)
while (--rmdr > 0 && (c = getc(file)) != 0 && c != EOF)
*buf++ = c;
*buf++ = 0;
- getc(file);
+ (void) getc(file);
return ((feof(file) || ferror(file)) ? NULL : 1);
}
diff --git a/usr/src/ucbcmd/printenv/printenv.c b/usr/src/ucbcmd/printenv/printenv.c
index c21579807b..74bf91e1db 100644
--- a/usr/src/ucbcmd/printenv/printenv.c
+++ b/usr/src/ucbcmd/printenv/printenv.c
@@ -19,6 +19,7 @@
*
* CDDL HEADER END
*/
+
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
@@ -56,6 +57,7 @@ main(int argc, char *argv[])
int found = 0;
argc--, argv++;
+
if (environ)
for (ep = environ; *ep; ep++)
if (argc == 0 || prefix(argv[0], *ep)) {
@@ -73,7 +75,7 @@ main(int argc, char *argv[])
return (!found);
}
-int
+static int
prefix(char *cp, char *dp)
{
diff --git a/usr/src/ucbcmd/sum/sum.c b/usr/src/ucbcmd/sum/sum.c
index 9804f88227..5397a5e150 100644
--- a/usr/src/ucbcmd/sum/sum.c
+++ b/usr/src/ucbcmd/sum/sum.c
@@ -32,9 +32,10 @@ main(int argc, char **argv)
i = 1;
do {
- if(i < argc) {
+ if (i < argc) {
if ((f = fopen(argv[i], "r")) == NULL) {
- fprintf(stderr, "sum: Can't open %s\n", argv[i]);
+ (void) fprintf(stderr,
+ "sum: Can't open %s\n", argv[i]);
errflg += 10;
continue;
}
@@ -53,13 +54,18 @@ main(int argc, char **argv)
}
if (ferror(f)) {
errflg++;
- fprintf(stderr, "sum: read error on %s\n", argc>1?argv[i]:"-");
+ (void) fprintf(stderr,
+ "sum: read error on %s\n",
+ argc > 1 ? argv[i] : "-");
}
- printf("%05u %5lld", sum, (nbytes+BUFSIZ-1)/BUFSIZ);
- if(argc > 2)
- printf(" %s", argv[i]);
- printf("\n");
- fclose(f);
- } while(++i < argc);
+
+ (void) printf("%05u %5lld", sum,
+ (nbytes + BUFSIZ - 1) / BUFSIZ);
+ if (argc > 2)
+ (void) printf(" %s", argv[i]);
+ (void) printf("\n");
+ (void) fclose(f);
+ } while (++i < argc);
+
return (errflg);
}
diff --git a/usr/src/ucbcmd/test/test.c b/usr/src/ucbcmd/test/test.c
index 53b1c53509..b8be0f59ac 100644
--- a/usr/src/ucbcmd/test/test.c
+++ b/usr/src/ucbcmd/test/test.c
@@ -6,8 +6,8 @@
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
-
-/* Copyright (c) 1980 Regents of the University of California.
+/*
+ * Copyright (c) 1980 Regents of the University of California.
* All rights reserved. The Berkeley software License Agreement
* specifies the terms and conditions for redistribution.
*/
@@ -20,20 +20,28 @@
*/
#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
-#define EQ(a,b) ((strcmp(a,b)==0))
+#include <string.h>
+
+#define EQ(a, b) ((strcmp(a, b) == 0))
-int ap;
-int ac;
-char **av;
+static char *nxtarg(int mt);
+static int exp(void);
+static int e1(void);
+static int e2(void);
+static int e3(void);
+static int tio(char *a, int f);
+static int ftype(char *f, int field);
+static int filtyp(char *f, int field);
+static int fsizep(char *f);
+static void synbad(char *s1, char *s2);
-void synbad(char *s1, char *s2);
-int tio(char *a, int f);
-int ftype(char *f, int field);
-int filtyp(char *f, int field);
-int fsizep(char *f);
-char *nxtarg(int mt);
+static int ap;
+static int ac;
+static char **av;
int
main(int argc, char *argv[])
@@ -41,33 +49,33 @@ main(int argc, char *argv[])
int status;
ac = argc; av = argv; ap = 1;
- if(EQ(argv[0],"[")) {
- if(!EQ(argv[--ac],"]"))
- synbad("] missing","");
+ if (EQ(argv[0], "[")) {
+ if (!EQ(argv[--ac], "]"))
+ synbad("] missing", "");
}
argv[ac] = 0;
- if (ac<=1) exit(1);
- status = (exp()?0:1);
- if (nxtarg(1)!=0)
- synbad("too many arguments","");
+ if (ac <= 1)
+ exit(1);
+ status = (exp() ? 0 : 1);
+ if (nxtarg(1) != 0)
+ synbad("too many arguments", "");
return (status);
}
-char *
+static char *
nxtarg(int mt)
{
-
- if (ap>=ac) {
- if(mt) {
+ if (ap >= ac) {
+ if (mt) {
ap++;
- return(0);
+ return (0);
}
- synbad("argument expected","");
+ synbad("argument expected", "");
}
- return(av[ap++]);
+ return (av[ap++]);
}
-int
+static int
exp(void)
{
int p1;
@@ -77,15 +85,15 @@ exp(void)
p2 = nxtarg(1);
if (p2 != 0) {
if (EQ(p2, "-o"))
- return(p1 | exp());
+ return (p1 | exp());
if (EQ(p2, "]"))
- synbad("syntax error","");
+ synbad("syntax error", "");
}
ap--;
- return(p1);
+ return (p1);
}
-int
+static int
e1(void)
{
int p1;
@@ -94,21 +102,21 @@ e1(void)
p1 = e2();
p2 = nxtarg(1);
if ((p2 != 0) && EQ(p2, "-a"))
- return(p1 & e1());
+ return (p1 & e1());
ap--;
- return(p1);
+ return (p1);
}
-int
+static int
e2(void)
{
if (EQ(nxtarg(0), "!"))
- return(!e3());
+ return (!e3());
ap--;
- return(e3());
+ return (e3());
}
-int
+static int
e3(void)
{
int p1;
@@ -116,161 +124,160 @@ e3(void)
char *p2;
int int1, int2;
- a=nxtarg(0);
- if(EQ(a, "(")) {
+ a = nxtarg(0);
+ if (EQ(a, "(")) {
p1 = exp();
- if(!EQ(nxtarg(0), ")")) synbad(") expected","");
- return(p1);
+ if (!EQ(nxtarg(0), ")")) synbad(") expected", "");
+ return (p1);
}
p2 = nxtarg(1);
ap--;
if ((p2 == 0) || (!EQ(p2, "=") && !EQ(p2, "!="))) {
- if(EQ(a, "-r"))
- return(tio(nxtarg(0), 4));
+ if (EQ(a, "-r"))
+ return (tio(nxtarg(0), 4));
- if(EQ(a, "-w"))
- return(tio(nxtarg(0), 2));
+ if (EQ(a, "-w"))
+ return (tio(nxtarg(0), 2));
- if(EQ(a, "-x"))
- return(tio(nxtarg(0), 1));
+ if (EQ(a, "-x"))
+ return (tio(nxtarg(0), 1));
- if(EQ(a, "-d"))
- return(filtyp(nxtarg(0), S_IFDIR));
+ if (EQ(a, "-d"))
+ return (filtyp(nxtarg(0), S_IFDIR));
- if(EQ(a, "-c"))
- return(filtyp(nxtarg(0), S_IFCHR));
+ if (EQ(a, "-c"))
+ return (filtyp(nxtarg(0), S_IFCHR));
- if(EQ(a, "-b"))
- return(filtyp(nxtarg(0), S_IFBLK));
+ if (EQ(a, "-b"))
+ return (filtyp(nxtarg(0), S_IFBLK));
- if(EQ(a, "-f")) {
+ if (EQ(a, "-f")) {
struct stat statb;
- return(stat(nxtarg(0), &statb) >= 0 &&
+ return (stat(nxtarg(0), &statb) >= 0 &&
(statb.st_mode & S_IFMT) != S_IFDIR);
}
- if(EQ(a, "-h"))
- return(filtyp(nxtarg(0), S_IFLNK));
+ if (EQ(a, "-h"))
+ return (filtyp(nxtarg(0), S_IFLNK));
- if(EQ(a, "-u"))
- return(ftype(nxtarg(0), S_ISUID));
+ if (EQ(a, "-u"))
+ return (ftype(nxtarg(0), S_ISUID));
- if(EQ(a, "-g"))
- return(ftype(nxtarg(0), S_ISGID));
+ if (EQ(a, "-g"))
+ return (ftype(nxtarg(0), S_ISGID));
- if(EQ(a, "-k"))
- return(ftype(nxtarg(0), S_ISVTX));
+ if (EQ(a, "-k"))
+ return (ftype(nxtarg(0), S_ISVTX));
- if(EQ(a, "-p"))
+ if (EQ(a, "-p"))
#ifdef S_IFIFO
- return(filtyp(nxtarg(0), S_IFIFO));
+ return (filtyp(nxtarg(0), S_IFIFO));
#else
- return(nxtarg(0), 0);
+ return (nxtarg(0), 0);
#endif
- if(EQ(a, "-s"))
- return(fsizep(nxtarg(0)));
+ if (EQ(a, "-s"))
+ return (fsizep(nxtarg(0)));
- if(EQ(a, "-t"))
- if(ap>=ac)
- return(isatty(1));
+ if (EQ(a, "-t"))
+ if (ap >= ac)
+ return (isatty(1));
else if (EQ((a = nxtarg(0)), "-a") || EQ(a, "-o")) {
ap--;
- return(isatty(1));
+ return (isatty(1));
} else
- return(isatty(atoi(a)));
+ return (isatty(atoi(a)));
- if(EQ(a, "-n"))
- return(!EQ(nxtarg(0), ""));
- if(EQ(a, "-z"))
- return(EQ(nxtarg(0), ""));
+ if (EQ(a, "-n"))
+ return (!EQ(nxtarg(0), ""));
+ if (EQ(a, "-z"))
+ return (EQ(nxtarg(0), ""));
}
p2 = nxtarg(1);
- if (p2==0)
- return(!EQ(a,""));
+ if (p2 == 0)
+ return (!EQ(a, ""));
if (EQ(p2, "-a") || EQ(p2, "-o")) {
ap--;
- return(!EQ(a,""));
+ return (!EQ(a, ""));
}
- if(EQ(p2, "="))
- return(EQ(nxtarg(0), a));
+ if (EQ(p2, "="))
+ return (EQ(nxtarg(0), a));
- if(EQ(p2, "!="))
- return(!EQ(nxtarg(0), a));
+ if (EQ(p2, "!="))
+ return (!EQ(nxtarg(0), a));
int1 = atoi(a);
int2 = atoi(nxtarg(0));
- if(EQ(p2, "-eq"))
- return(int1==int2);
- if(EQ(p2, "-ne"))
- return(int1!=int2);
- if(EQ(p2, "-gt"))
- return(int1>int2);
- if(EQ(p2, "-lt"))
- return(int1<int2);
- if(EQ(p2, "-ge"))
- return(int1>=int2);
- if(EQ(p2, "-le"))
- return(int1<=int2);
-
- synbad("unknown operator ",p2);
+ if (EQ(p2, "-eq"))
+ return (int1 == int2);
+ if (EQ(p2, "-ne"))
+ return (int1 != int2);
+ if (EQ(p2, "-gt"))
+ return (int1 > int2);
+ if (EQ(p2, "-lt"))
+ return (int1 < int2);
+ if (EQ(p2, "-ge"))
+ return (int1 >= int2);
+ if (EQ(p2, "-le"))
+ return (int1 <= int2);
+
+ synbad("unknown operator ", p2);
/* NOTREACHED */
return (0);
}
-int
+static int
tio(char *a, int f)
{
-
if (access(a, f) == 0)
- return(1);
+ return (1);
else
- return(0);
+ return (0);
}
-int
+static int
ftype(char *f, int field)
{
struct stat statb;
- if(stat(f,&statb)<0)
- return(0);
- if((statb.st_mode&field)==field)
- return(1);
- return(0);
+ if (stat(f, &statb) < 0)
+ return (0);
+ if ((statb.st_mode & field) == field)
+ return (1);
+ return (0);
}
-int
+static int
filtyp(char *f, int field)
{
struct stat statb;
if (field == S_IFLNK) {
- if(lstat(f,&statb)<0)
- return(0);
+ if (lstat(f, &statb) < 0)
+ return (0);
} else {
- if(stat(f,&statb)<0)
- return(0);
+ if (stat(f, &statb) < 0)
+ return (0);
}
- if((statb.st_mode&S_IFMT)==field)
- return(1);
+ if ((statb.st_mode & S_IFMT) == field)
+ return (1);
else
- return(0);
+ return (0);
}
-int
+static int
fsizep(char *f)
{
struct stat statb;
- if(stat(f,&statb)<0)
- return(0);
- return(statb.st_size>0);
+ if (stat(f, &statb) < 0)
+ return (0);
+ return (statb.st_size > 0);
}
-void
+static void
synbad(char *s1, char *s2)
{
(void) write(2, "test: ", 6);
@@ -279,11 +286,3 @@ synbad(char *s1, char *s2)
(void) write(2, "\n", 1);
exit(255);
}
-
-int
-length(char *s)
-{
- char *es=s;
- while(*es++);
- return(es-s-1);
-}
diff --git a/usr/src/ucbcmd/users/users.c b/usr/src/ucbcmd/users/users.c
index d4011b0ecd..4df492ea41 100644
--- a/usr/src/ucbcmd/users/users.c
+++ b/usr/src/ucbcmd/users/users.c
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
@@ -8,12 +13,7 @@
* specifies the terms and conditions for redistribution.
*/
-/*
- * Copyright (c) 1983-1998 by Sun Microsystems, Inc.
- * All rights reserved.
- */
-
-#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.1 */
+#pragma ident "%Z%%M% %I% %E% SMI"
/*
* users
@@ -23,23 +23,25 @@
#include <sys/types.h>
#include <stdlib.h>
#include <utmpx.h>
+#include <string.h>
-static char *strndup(char *p, int n);
+static char **names;
+static char **namp;
-struct utmpx *utmpx;
-char **names;
-char **namp;
+static char *strndup(char *p, int n);
+static int scmp(const void *p, const void *q);
+static void summary(void);
-main(argc, argv)
-char **argv;
+int
+main(int argc, char **argv)
{
- char *tp;
int nusers = 0;
int bufflen = BUFSIZ;
+ struct utmpx *utmpx;
if (argc == 2)
if (!utmpxname(argv[1])) {
- fprintf(stderr, "Filename is too long\n");
+ (void) fprintf(stderr, "Filename is too long\n");
exit(1);
}
@@ -67,36 +69,37 @@ char **argv;
endutxent();
summary();
- exit(0);
+ return (0);
}
-static char *
+static char *
strndup(char *p, int n)
{
register char *x;
x = malloc(n + 1);
- strncpy(x, p, n);
- *(x + n) = '\0';
+ (void) strlcpy(x, p, n + 1);
return (x);
}
+static int
scmp(const void *p, const void *q)
{
return (strcmp((char *)p, (char *)q));
}
-summary()
+static void
+summary(void)
{
register char **p;
qsort(names, namp - names, sizeof (names[0]), scmp);
for (p = names; p < namp; p++) {
if (p != names)
- putchar(' ');
- fputs(*p, stdout);
+ (void) putchar(' ');
+ (void) fputs(*p, stdout);
}
if (namp != names) /* at least one user */
- putchar('\n');
+ (void) putchar('\n');
}
diff --git a/usr/src/ucbcmd/whoami/whoami.c b/usr/src/ucbcmd/whoami/whoami.c
index d7beb3a5a4..e1344a723f 100644
--- a/usr/src/ucbcmd/whoami/whoami.c
+++ b/usr/src/ucbcmd/whoami/whoami.c
@@ -1,5 +1,5 @@
/*
- * Copyright 1988 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -14,7 +14,6 @@
#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <unistd.h>
#include <sys/types.h>
#include <pwd.h>
@@ -29,6 +28,7 @@
int
main(int argc, char *argv[])
+/*ARGSUSED*/
{
struct passwd *pp;
uid_t euid;
@@ -46,6 +46,6 @@ main(int argc, char *argv[])
(void) printf(gettext(MSG), euid);
exit(1);
}
- printf("%s\n", pp->pw_name);
+ (void) printf("%s\n", pp->pw_name);
return (0);
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-06 03:39:16 +0000