diff options
author | Arnold D. Robbins <arnold@skeeve.com> | 2015-08-02 21:41:40 +0300 |
---|---|---|
committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-08-02 21:41:40 +0300 |
commit | edc2856a2ae2dc46037f85652440bd329b1a2c8a (patch) | |
tree | c7dc2821a1cea7d65cf8b6ed48d3494e98b98d09 /awklib/eg | |
parent | 4b00462246822209b642a4dd63491e59a4fab759 (diff) | |
download | egawk-edc2856a2ae2dc46037f85652440bd329b1a2c8a.tar.gz egawk-edc2856a2ae2dc46037f85652440bd329b1a2c8a.tar.bz2 egawk-edc2856a2ae2dc46037f85652440bd329b1a2c8a.zip |
Rework zOS patches; keep separate from autotools.
Diffstat (limited to 'awklib/eg')
-rw-r--r-- | awklib/eg/lib/grcat.c | 6 | ||||
-rw-r--r-- | awklib/eg/lib/pwcat.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/awklib/eg/lib/grcat.c b/awklib/eg/lib/grcat.c index 7d6b6a74..cf39083c 100644 --- a/awklib/eg/lib/grcat.c +++ b/awklib/eg/lib/grcat.c @@ -31,11 +31,11 @@ main(int argc, char **argv) int i; while ((g = getgrent()) != NULL) { -#ifdef ZOS_USS - printf("%s:%ld:", g->gr_name, (long) g->gr_gid); -#else +#ifdef HAVE_STRUCT_GROUP_GR_PASSWD printf("%s:%s:%ld:", g->gr_name, g->gr_passwd, (long) g->gr_gid); +#else + printf("%s:*:%ld:", g->gr_name, (long) g->gr_gid); #endif for (i = 0; g->gr_mem[i] != NULL; i++) { printf("%s", g->gr_mem[i]); diff --git a/awklib/eg/lib/pwcat.c b/awklib/eg/lib/pwcat.c index 934ef34e..cfe250c3 100644 --- a/awklib/eg/lib/pwcat.c +++ b/awklib/eg/lib/pwcat.c @@ -26,14 +26,14 @@ main(int argc, char **argv) struct passwd *p; while ((p = getpwent()) != NULL) -#ifdef ZOS_USS - printf("%s:%ld:%ld:%s:%s\n", - p->pw_name, (long) p->pw_uid, - (long) p->pw_gid, p->pw_dir, p->pw_shell); -#else +#ifdef HAVE_STRUCT_PASSWD_PW_PASSWD printf("%s:%s:%ld:%ld:%s:%s:%s\n", p->pw_name, p->pw_passwd, (long) p->pw_uid, (long) p->pw_gid, p->pw_gecos, p->pw_dir, p->pw_shell); +#else + printf("%s:*:%ld:%ld:%s:%s\n", + p->pw_name, (long) p->pw_uid, + (long) p->pw_gid, p->pw_dir, p->pw_shell); #endif endpwent(); |