Move to gawk-3.1.2.

2 files changed, 22 insertions, 10 deletions

diff --git a/awklib/eg/lib/grcat.c b/awklib/eg/lib/grcat.c
index 802aa639..c022dc7e 100644
--- a/awklib/eg/lib/grcat.c
+++ b/awklib/eg/lib/grcat.c
@@ -12,9 +12,13 @@
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
+ 
+#if defined (STDC_HEADERS)
+#include <stdlib.h>
+#endif
 
-#ifndef HAVE_GETPGRENT
-int main() { exit(0); }
+#ifndef HAVE_GETGRENT
+int main() { return 0; }
 #else
 #include <stdio.h>
 #include <grp.h>
@@ -28,8 +32,8 @@ char **argv;
     int i;
 
     while ((g = getgrent()) != NULL) {
-        printf("%s:%s:%d:", g->gr_name, g->gr_passwd,
-                                            g->gr_gid);
+        printf("%s:%s:%ld:", g->gr_name, g->gr_passwd,
+                                     (long) g->gr_gid);
         for (i = 0; g->gr_mem[i] != NULL; i++) {
             printf("%s", g->gr_mem[i]);
             if (g->gr_mem[i+1] != NULL)
@@ -38,6 +42,6 @@ char **argv;
         putchar('\n');
     }
     endgrent();
-    exit(0);
+    return 0;
 }
-#endif /* HAVE_GETPGRENT */
+#endif /* HAVE_GETGRENT */
diff --git a/awklib/eg/lib/pwcat.c b/awklib/eg/lib/pwcat.c
index b9a71340..d6ad0b64 100644
--- a/awklib/eg/lib/pwcat.c
+++ b/awklib/eg/lib/pwcat.c
@@ -8,9 +8,17 @@
  * Public Domain
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <pwd.h>
 
+#if defined (STDC_HEADERS)
+#include <stdlib.h>
+#endif
+
 int
 main(argc, argv)
 int argc;
@@ -19,10 +27,10 @@ char **argv;
     struct passwd *p;
 
     while ((p = getpwent()) != NULL)
-        printf("%s:%s:%d:%d:%s:%s:%s\n",
-            p->pw_name, p->pw_passwd, p->pw_uid,
-            p->pw_gid, p->pw_gecos, p->pw_dir, p->pw_shell);
+        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);
 
     endpwent();
-    exit(0);
+    return 0;
 }