summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspew <devnull@localhost>2018-06-17 17:38:00 -0400
committerspew <devnull@localhost>2018-06-17 17:38:00 -0400
commit583c6d269b4589be4d3b711b56ccf51d89414215 (patch)
tree2ee7ed9ce76ba0970cdfd323e8f0ec4cbfd6a3f5
parent0763dd42793dea2023e0f345f647af9932486841 (diff)
downloadplan9front-583c6d269b4589be4d3b711b56ccf51d89414215.tar.xz
ape: add some common fields for stat, grp and pwd
-rw-r--r--sys/include/ape/grp.h1
-rw-r--r--sys/include/ape/pwd.h2
-rw-r--r--sys/include/ape/sys/stat.h1
-rw-r--r--sys/src/ape/lib/ap/plan9/dirtostat.c1
-rw-r--r--sys/src/ape/lib/ap/plan9/getgrgid.c1
-rw-r--r--sys/src/ape/lib/ap/plan9/getgrnam.c1
-rw-r--r--sys/src/ape/lib/ap/plan9/getpwnam.c2
-rw-r--r--sys/src/ape/lib/ap/plan9/getpwuid.c2
8 files changed, 11 insertions, 0 deletions
diff --git a/sys/include/ape/grp.h b/sys/include/ape/grp.h
index a5112e0d3..2c9cfabeb 100644
--- a/sys/include/ape/grp.h
+++ b/sys/include/ape/grp.h
@@ -8,6 +8,7 @@
struct group {
char *gr_name;
+ char *gr_passwd;
gid_t gr_gid;
char **gr_mem;
};
diff --git a/sys/include/ape/pwd.h b/sys/include/ape/pwd.h
index 3fdb5d082..964590fe9 100644
--- a/sys/include/ape/pwd.h
+++ b/sys/include/ape/pwd.h
@@ -8,8 +8,10 @@
struct passwd {
char *pw_name;
+ char *pw_passwd;
uid_t pw_uid;
gid_t pw_gid;
+ char *pw_gecos;
char *pw_dir;
char *pw_shell;
};
diff --git a/sys/include/ape/sys/stat.h b/sys/include/ape/sys/stat.h
index 7ae888aea..4e8f9c7c1 100644
--- a/sys/include/ape/sys/stat.h
+++ b/sys/include/ape/sys/stat.h
@@ -17,6 +17,7 @@ struct stat {
nlink_t st_nlink;
uid_t st_uid;
gid_t st_gid;
+ dev_t st_rdev;
off_t st_size;
time_t st_atime;
time_t st_mtime;
diff --git a/sys/src/ape/lib/ap/plan9/dirtostat.c b/sys/src/ape/lib/ap/plan9/dirtostat.c
index 6abc6dfa7..3dcbafd18 100644
--- a/sys/src/ape/lib/ap/plan9/dirtostat.c
+++ b/sys/src/ape/lib/ap/plan9/dirtostat.c
@@ -27,6 +27,7 @@ _dirtostat(struct stat *s, Dir *d, Fdinfo *fi)
s->st_nlink = 1;
s->st_uid = 1;
s->st_gid = 1;
+ s->st_rdev = 0;
if(fi && (fi->flags&FD_BUFFERED))
s->st_size = fi->buf->n;
else
diff --git a/sys/src/ape/lib/ap/plan9/getgrgid.c b/sys/src/ape/lib/ap/plan9/getgrgid.c
index 77e2997fa..de0f02d91 100644
--- a/sys/src/ape/lib/ap/plan9/getgrgid.c
+++ b/sys/src/ape/lib/ap/plan9/getgrgid.c
@@ -17,6 +17,7 @@ getgrgid(gid_t gid)
mem = 0;
if(_getpw(&num, &nam, &mem)){
holdgroup.gr_name = nam;
+ holdgroup.gr_passwd = "";
holdgroup.gr_gid = num;
holdgroup.gr_mem = _grpmems(mem);
return &holdgroup;
diff --git a/sys/src/ape/lib/ap/plan9/getgrnam.c b/sys/src/ape/lib/ap/plan9/getgrnam.c
index 7033120e4..de2a7d33d 100644
--- a/sys/src/ape/lib/ap/plan9/getgrnam.c
+++ b/sys/src/ape/lib/ap/plan9/getgrnam.c
@@ -17,6 +17,7 @@ getgrnam(const char *name)
mem = 0;
if(_getpw(&num, &nam, &mem)){
holdgroup.gr_name = nam;
+ holdgroup.gr_passwd = "";
holdgroup.gr_gid = num;
holdgroup.gr_mem = _grpmems(mem);
return &holdgroup;
diff --git a/sys/src/ape/lib/ap/plan9/getpwnam.c b/sys/src/ape/lib/ap/plan9/getpwnam.c
index e9d1c5b4e..9cb18294f 100644
--- a/sys/src/ape/lib/ap/plan9/getpwnam.c
+++ b/sys/src/ape/lib/ap/plan9/getpwnam.c
@@ -18,10 +18,12 @@ getpwnam(const char *name)
mem = 0;
if(_getpw(&num, &nam, &mem)){
holdpw.pw_name = nam;
+ holdpw.pw_passwd = "";
holdpw.pw_uid = num;
holdpw.pw_gid = num;
strncpy(dirbuf+5, nam, sizeof(dirbuf)-6);
holdpw.pw_dir = dirbuf;
+ holdpw.pw_gecos = "";
holdpw.pw_shell = rc;
return &holdpw;
}
diff --git a/sys/src/ape/lib/ap/plan9/getpwuid.c b/sys/src/ape/lib/ap/plan9/getpwuid.c
index e2983765b..355ab9313 100644
--- a/sys/src/ape/lib/ap/plan9/getpwuid.c
+++ b/sys/src/ape/lib/ap/plan9/getpwuid.c
@@ -19,10 +19,12 @@ getpwuid(uid_t uid)
mem = 0;
if(_getpw(&num, &nam, &mem)){
holdpw.pw_name = nam;
+ holdpw.pw_passwd = "";
holdpw.pw_uid = num;
holdpw.pw_gid = num;
strncpy(dirbuf+5, nam, sizeof(dirbuf)-6);
holdpw.pw_dir = dirbuf;
+ holdpw.pw_gecos = "";
holdpw.pw_shell = rc;
return &holdpw;
}