From: Ben Gras <ben@minix3.org>
Date: Fri, 17 Mar 2006 09:27:26 +0000 (+0000)
Subject: readlink command implementation + manpage
X-Git-Tag: v3.1.2a~204
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/static/d3.min.js?a=commitdiff_plain;h=96783ed1f732a1ccdbe77948df7b2e5c5ebe9d16;p=minix.git

readlink command implementation + manpage
---

diff --git a/commands/simple/Makefile b/commands/simple/Makefile
index 143f6991e..cae4860fd 100755
--- a/commands/simple/Makefile
+++ b/commands/simple/Makefile
@@ -154,6 +154,7 @@ ALL	= \
 	rdate \
 	readall \
 	rev \
+	readlink \
 	readfs \
 	remsync \
 	rget \
@@ -1044,6 +1045,7 @@ install:	\
 	/usr/bin/rawspeed \
 	/usr/bin/rdate \
 	/usr/bin/readall \
+	/usr/bin/readlink \
 	/usr/bin/readfs \
 	/usr/bin/remsync \
 	/usr/bin/rget \
@@ -1501,6 +1503,9 @@ install:	\
 /usr/bin/readall:	readall
 	install -cs -o bin $? $@
 
+/usr/bin/readlink:	/usr/bin/stat
+	install -l $? $@
+
 /usr/bin/readfs:	readfs
 	install -cs -o bin $? $@
 
diff --git a/commands/simple/stat.c b/commands/simple/stat.c
index 29e4c5a2c..be4d70d72 100755
--- a/commands/simple/stat.c
+++ b/commands/simple/stat.c
@@ -25,6 +25,7 @@
 # include	<limits.h>
 # include	<stdio.h>
 # include	<stdlib.h>
+# include	<unistd.h>
 # include 	<string.h>
 # include	<time.h>
 # include	<sys/stat.h>
@@ -87,6 +88,8 @@ void printit(struct stat* sb, struct field* f, int n);
 void rwx(mode_t mode, char *bit);
 void usage(void);
 
+int do_readlink=0;
+
 int main(int ac, char** av)
 {
     int      i, j, nprint = 0, files = 0;
@@ -98,6 +101,7 @@ int main(int ac, char** av)
     if ((arg0 = strrchr(av[0], '/')) == NULL) arg0 = av[0]; else arg0++;
 #ifdef S_IFLNK
     if (equal(arg0, "lstat")) sym = 1;
+    if (equal(arg0, "readlink")) do_readlink = 1;
 #endif
 
     if (ac > 1 && equal(av[i = 1], "-"))
@@ -155,6 +159,7 @@ int main(int ac, char** av)
 	files++;	/* We don't know how many files come from stdin. */
 
     if (files == 0) {	/* Stat all file descriptors. */
+	if(do_readlink) return 0;
 	for (i= 0; i<OPEN_MAX; i++) {
 	    err= fstat(i, &sbuf);
 	    if (err == -1 && errno == EBADF)
@@ -177,6 +182,19 @@ int main(int ac, char** av)
 	    while (fgets(buf, sizeof(buf), stdin)) {
 	    	char *p= strchr(buf, '\n');
 	    	if (p) *p= 0;
+#ifdef S_IFLNK
+		if(do_readlink) {
+			char sbuf[300];
+			int n;
+			if((n=readlink(buf, sbuf, sizeof(sbuf)-1)) < 0) {
+				perror(buf);
+				continue;
+			}
+			sbuf[n] = '\0';
+			printf("%s: %s\n", buf, sbuf);
+			continue;
+		}
+#endif
 		if (!sym) err= stat(av[i], &sbuf);
 		if (sym || (err != 0 && errno == ENOENT)) {
 		    err= lstat(av[i], &sbuf);
@@ -215,6 +233,17 @@ int main(int ac, char** av)
 	    }
 	    continue;
 	}
+	if(do_readlink) {
+		char sbuf[300];
+		int n;
+		if((n=err=readlink(av[i], sbuf, sizeof(sbuf)-1)) < 0) {
+			perror(av[i]);
+			continue;
+		}
+		sbuf[n] = '\0';
+		printf("%s: %s\n", av[i], sbuf);
+		continue;
+	}
 	if (!sym) err= stat(av[i], &sbuf);
 	if (sym || (err != 0 && errno == ENOENT)) err= lstat(av[i], &sbuf);
 	if (err != -1) {
diff --git a/man/man1/stat.1 b/man/man1/stat.1
index e8098d21a..8e9c222be 100644
--- a/man/man1/stat.1
+++ b/man/man1/stat.1
@@ -1,6 +1,6 @@
 .TH STAT 1
 .SH NAME
-stat, lstat \- provide a shell interface to the stat(2) system call
+stat, lstat, readlink \- provide a shell interface to the stat(2) system call
 .SH SYNOPSIS
 .B stat
 .RB [ - ]
@@ -25,8 +25,13 @@ is called as
 .B lstat
 then the
 .BR lstat (2)
-system call is used, otherwise symbolic links are expanded with
+system call is used, if called as 
+.B stat
+symbolic links are expanded with
 .BR stat (2).
+If called as
+.B readlink
+then the output is only the contents of the symbolic link.
 .PP
 If no fields are named then all fields are printed.  If no files are listed
 then all open filedescriptors are printed.