d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

o Remove old code from pwd(1); realpath(1) is now in its own directory.

Browse Source 
o Fix some unordered includes in pwd(1).
o Connect realpath(1) to the build.
This commit is contained in:
mike 2002-02-11 18:38:54 +00:00
parent 514239b04b
commit e9400873cc
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/Makefile
View File

@ -23,6 +23,7 @@ SUBDIR= cat \
ps \
pwd \
rcp \
realpath \
rm \
rmdir \
setfacl \

2
bin/pwd/Makefile
View File

@ -2,7 +2,5 @@
# $FreeBSD$
PROG= pwd
LINKS= ${BINDIR}/pwd ${BINDIR}/realpath
MAN= pwd.1 realpath.1
.include <bsd.prog.mk>

20
bin/pwd/pwd.c
View File

@ -45,16 +45,15 @@ static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
#include <sys/types.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <err.h>
#include <errno.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/param.h>
static char *getcwd_logical(void);
void usage(void);
@ -65,16 +64,6 @@ main(int argc, char *argv[])
int Lflag, Pflag;
int ch;
char *p;
char buf[PATH_MAX];
if (strcmp(getprogname(), "realpath") == 0) {
if (argc != 2)
usage();
if ((p = realpath(argv[1], buf)) == NULL)
err(1, "%s", argv[1]);
(void)printf("%s\n", p);
exit(0);
}
Lflag = Pflag = 0;
while ((ch = getopt(argc, argv, "LP")) != -1)
@ -107,10 +96,7 @@ void
usage(void)
{
if (strcmp(getprogname(), "realpath") == 0)
(void)fprintf(stderr, "usage: realpath [path]\n");
else
(void)fprintf(stderr, "usage: pwd [-L | -P]\n");
(void)fprintf(stderr, "usage: pwd [-L | -P]\n");
exit(1);
}