diff options
author | joe <joe@FreeBSD.org> | 2000-06-17 14:19:33 +0000 |
---|---|---|
committer | joe <joe@FreeBSD.org> | 2000-06-17 14:19:33 +0000 |
commit | 8de98cc2fa7b119cc8deb33c61c9496d25825b49 (patch) | |
tree | 33363d4028bb162e624a3a2c5257ab020378f6e0 /usr.bin | |
parent | 3e8b2c512359fd536c5f66fbd9e265064d461886 (diff) | |
download | FreeBSD-src-8de98cc2fa7b119cc8deb33c61c9496d25825b49.zip FreeBSD-src-8de98cc2fa7b119cc8deb33c61c9496d25825b49.tar.gz |
Switch over to using the new fflagstostr and strtofflags library calls.
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/chflags/Makefile | 3 | ||||
-rw-r--r-- | usr.bin/chflags/chflags.c | 4 | ||||
-rw-r--r-- | usr.bin/find/Makefile | 3 | ||||
-rw-r--r-- | usr.bin/find/function.c | 4 | ||||
-rw-r--r-- | usr.bin/xinstall/Makefile | 3 | ||||
-rw-r--r-- | usr.bin/xinstall/xinstall.c | 2 |
6 files changed, 6 insertions, 13 deletions
diff --git a/usr.bin/chflags/Makefile b/usr.bin/chflags/Makefile index b545bfa..ebc9c0f 100644 --- a/usr.bin/chflags/Makefile +++ b/usr.bin/chflags/Makefile @@ -5,7 +5,6 @@ NOSHARED?=yes PROG= chflags CFLAGS+=-Wall -.PATH: ${.CURDIR}/../../lib/libc/gen -SRCS= chflags.c setflags.c +SRCS= chflags.c .include <bsd.prog.mk> diff --git a/usr.bin/chflags/chflags.c b/usr.bin/chflags/chflags.c index c19c7e4..3ff36ef 100644 --- a/usr.bin/chflags/chflags.c +++ b/usr.bin/chflags/chflags.c @@ -56,8 +56,6 @@ static const char rcsid[] = #include <string.h> #include <unistd.h> -int setflags __P((char **, u_long *, u_long *)); - void usage __P((void)); int @@ -123,7 +121,7 @@ main(argc, argv) set = val; oct = 1; } else { - if (setflags(&flags, &set, &clear)) + if (strtofflags(&flags, &set, &clear)) errx(1, "invalid flag: %s", flags); clear = ~clear; oct = 0; diff --git a/usr.bin/find/Makefile b/usr.bin/find/Makefile index 6ca99d0..9691657 100644 --- a/usr.bin/find/Makefile +++ b/usr.bin/find/Makefile @@ -3,7 +3,6 @@ CFLAGS+= -Wall PROG= find -SRCS= find.c function.c ls.c main.c misc.c operator.c option.c setflags.c -.PATH: ${.CURDIR}/../../lib/libc/gen +SRCS= find.c function.c ls.c main.c misc.c operator.c option.c .include <bsd.prog.mk> diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c index d833a91..1534ee2 100644 --- a/usr.bin/find/function.c +++ b/usr.bin/find/function.c @@ -75,8 +75,6 @@ static const char rcsid[] = } \ } -u_long setflags __P((char **, u_long *, u_long *)); - static PLAN *palloc __P((enum ntype, int (*) __P((PLAN *, FTSENT *)))); /* @@ -1060,7 +1058,7 @@ c_flags(flags_str) new->flags = F_ATLEAST; flags_str++; } - if (setflags(&flags_str, &flags, ¬flags) == 1) + if (strtofflags(&flags_str, &flags, ¬flags) == 1) errx(1, "-flags: %s: illegal flags string", flags_str); new->fl_flags = flags; diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile index c8bd6e3..f41f80e 100644 --- a/usr.bin/xinstall/Makefile +++ b/usr.bin/xinstall/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PROG= xinstall -SRCS= setflags.c xinstall.c -.PATH: ${.CURDIR}/../../lib/libc/gen +SRCS= xinstall.c MAN1= install.1 install: maninstall diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 1db50f1..87c0b1c 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -151,7 +151,7 @@ main(argc, argv) break; case 'f': flags = optarg; - if (setflags(&flags, &fset, NULL)) + if (strtofflags(&flags, &fset, NULL)) errx(EX_USAGE, "%s: invalid flag", flags); iflags |= SETFLAGS; break; |