system_cmds-431.tar.gz

[apple/system_cmds.git] / getconf.tproj / getconf.c

diff --git a/getconf.tproj/getconf.c b/getconf.tproj/getconf.c
index 8b636ddbdd08ba232d28087252f43ac7aa451714..9cb0b7d33c7e158836c1cca5ef5bf4ac55fce4f7 100644 (file)
--- a/getconf.tproj/getconf.c
+++ b/getconf.tproj/getconf.c
@@ -96,12 +96,6 @@ main(int argc, char **argv)
        }
 
        if (argv[optind + 1] == NULL) { /* confstr or sysconf */
        }
 
        if (argv[optind + 1] == NULL) { /* confstr or sysconf */

-#ifdef APPLE_GETCONF_SPEC
-               if ((valid = find_progenv(name, &alt_path)) != 0) {
-                       printf(valid > 0 ? "defined\n" : "undefined\n");
-                       return 0;
-               }
-#endif /* APPLE_GETCONF_SPEC */

                if ((valid = find_limit(name, &limitval)) != 0) {
                        if (valid > 0)
                                printf("%" PRIdMAX "\n", limitval);
                if ((valid = find_limit(name, &limitval)) != 0) {
                        if (valid > 0)
                                printf("%" PRIdMAX "\n", limitval);


@@ -146,13 +140,15 @@ do_confstr(const char *name, int key)
 {
        size_t len;
 
 {
        size_t len;
 

+       errno = 0;

        len = confstr(key, 0, 0);
        len = confstr(key, 0, 0);

-       if (len == (size_t)-1)
-               err(EX_OSERR, "confstr: %s", name);
-       
-       if (len == 0)
-               printf("undefined\n");
-       else {
+       if (len == 0) {
+               if (errno != 0) {
+                       err(EX_OSERR, "confstr: %s", name);
+               } else {
+                       printf("undefined\n");
+               }
+       } else {

                char buf[len + 1];
 
                confstr(key, buf, len);
                char buf[len + 1];
 
                confstr(key, buf, len);