summaryrefslogtreecommitdiffstats
path: root/usr.bin/chflags
diff options
context:
space:
mode:
authorjoe <joe@FreeBSD.org>2000-01-27 21:17:01 +0000
committerjoe <joe@FreeBSD.org>2000-01-27 21:17:01 +0000
commitf1a9497df5db81a71987fa20f10c831030987e36 (patch)
treebcca8d67d721cd7e4ca8e7322d19df89912cfd26 /usr.bin/chflags
parent30f3b614b3b18d86be7ff164b9aba2617637b9c6 (diff)
downloadFreeBSD-src-f1a9497df5db81a71987fa20f10c831030987e36.zip
FreeBSD-src-f1a9497df5db81a71987fa20f10c831030987e36.tar.gz
Historically file flags (schg, uschg, etc) have been converted from
string to u_long and back using two functions, flags_to_string and string_to_flags, which co-existed with 'ls'. As time has progressed more and more other tools have used these private functions to manipulate the file flags. Recently I moved these functions from /usr/src/bin/ls to libutil, but after some discussion with bde it's been decided that they really ought to go in libc. There are two already existing libc functions for manipulating file modes: setmode and getmode. In keeping with these flags_to_string has been renamed getflags and string_to_flags to setflags. The manual page could probably be improved upon ;)
Diffstat (limited to 'usr.bin/chflags')
-rw-r--r--usr.bin/chflags/Makefile2
-rw-r--r--usr.bin/chflags/chflags.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/usr.bin/chflags/Makefile b/usr.bin/chflags/Makefile
index 4ba6a0a..30b6699 100644
--- a/usr.bin/chflags/Makefile
+++ b/usr.bin/chflags/Makefile
@@ -5,7 +5,5 @@ NOSHARED?=yes
PROG= chflags
CFLAGS+=-Wall
-DPADD= ${LIBUTIL}
-LDADD= -lutil
.include <bsd.prog.mk>
diff --git a/usr.bin/chflags/chflags.c b/usr.bin/chflags/chflags.c
index 2f4a96e..daeab4d 100644
--- a/usr.bin/chflags/chflags.c
+++ b/usr.bin/chflags/chflags.c
@@ -56,7 +56,6 @@ static const char rcsid[] =
#include <string.h>
#include <unistd.h>
-u_long string_to_flags __P((char **, u_long *, u_long *));
void usage __P((void));
int
@@ -122,7 +121,7 @@ main(argc, argv)
set = val;
oct = 1;
} else {
- if (string_to_flags(&flags, &set, &clear))
+ if (setflags(&flags, &set, &clear))
errx(1, "invalid flag: %s", flags);
clear = ~clear;
oct = 0;
OpenPOWER on IntegriCloud