suckless/sbase
1
0
Fork 0
mirror of git://git.suckless.org/sbase synced 2024-12-22 15:04:53 +00:00
Code Issues Projects Releases Wiki Activity

Audit pwd(1)

Browse Source 
Nothing special
1) Update manpage to current style.
2) Reorder functions
3) Logical trickery in getpwd()
This commit is contained in:
FRIGN 2015-03-03 17:24:14 +01:00
parent 5d0abb92aa
commit 7cb966c170
3 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -54,7 +54,7 @@ The following tools are implemented ('*' == finished, '#' == UTF-8 support,
#* paste yes none #* paste yes none
=*| printenv non-posix none =*| printenv non-posix none
#* printf yes none #* printf yes none
=* pwd yes none =*| pwd yes none
= readlink non-posix none = readlink non-posix none
=* renice yes none =* renice yes none
=*| rm yes none (-i) =*| rm yes none (-i)

4
pwd.1
View File

@ -1,4 +1,4 @@
.Dd November 23, 2014 .Dd March 3, 2015
.Dt PWD 1 .Dt PWD 1
.Os sbase .Os sbase
.Sh NAME .Sh NAME
@ -13,7 +13,7 @@ prints the path of the current working directory.
.Sh OPTIONS .Sh OPTIONS
.Bl -tag -width Ds .Bl -tag -width Ds
.It Fl L .It Fl L
Logical path, uses $PWD (default). Logical path, uses $PWD. This is the default.
.It Fl P .It Fl P
Physical path, avoids all symlinks. Physical path, avoids all symlinks.
.El .El

30
pwd.c
View File

@ -6,7 +6,19 @@
#include "util.h" #include "util.h"
static const char *getpwd(const char *cwd); static const char *
getpwd(const char *cwd)
{
const char *pwd;
struct stat cst, pst;
if (!(pwd = getenv("PWD")) || pwd[0] != '/' || stat(pwd, &pst) < 0)
return cwd;
if (stat(cwd, &cst) < 0)
eprintf("stat %s:", cwd);
return (pst.st_dev == cst.st_dev && pst.st_ino == cst.st_ino) ? pwd : cwd;
}
static void static void
usage(void) usage(void)
@ -34,19 +46,3 @@ main(int argc, char *argv[])
return 0; return 0;
} }
static const char *
getpwd(const char *cwd)
{
const char *pwd;
struct stat cst, pst;
if (!(pwd = getenv("PWD")) || pwd[0] != '/' || stat(pwd, &pst) < 0)
return cwd;
if (stat(cwd, &cst) < 0)
eprintf("stat %s:", cwd);
if (pst.st_dev == cst.st_dev && pst.st_ino == cst.st_ino)
return pwd;
else
return cwd;
}