From f1a9497df5db81a71987fa20f10c831030987e36 Mon Sep 17 00:00:00 2001 From: joe Date: Thu, 27 Jan 2000 21:17:01 +0000 Subject: 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 ;) --- usr.bin/xinstall/Makefile | 2 -- usr.bin/xinstall/xinstall.c | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'usr.bin/xinstall') diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile index 8033180..2c5dc9f 100644 --- a/usr.bin/xinstall/Makefile +++ b/usr.bin/xinstall/Makefile @@ -3,8 +3,6 @@ PROG= xinstall MAN1= install.1 -DPADD= ${LIBUTIL} -LDADD= -lutil install: maninstall ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 4665938..1db50f1 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -101,7 +101,6 @@ int compare __P((int, const char *, int, const char *, const struct stat *, const struct stat *)); void install __P((char *, char *, u_long, u_int)); void install_dir __P((char *)); -u_long string_to_flags __P((char **, u_long *, u_long *)); void strip __P((char *)); void usage __P((void)); int trymmap __P((int)); @@ -152,7 +151,7 @@ main(argc, argv) break; case 'f': flags = optarg; - if (string_to_flags(&flags, &fset, NULL)) + if (setflags(&flags, &fset, NULL)) errx(EX_USAGE, "%s: invalid flag", flags); iflags |= SETFLAGS; break; -- cgit v1.1