RESERVE_CONFIG_BUFFER --> bb_common_bufsiz1
author"Vladimir N. Oleynik" <dzo@simtreas.ru>
Sat, 15 Oct 2005 13:45:32 +0000 (13:45 -0000)
committer"Vladimir N. Oleynik" <dzo@simtreas.ru>
Sat, 15 Oct 2005 13:45:32 +0000 (13:45 -0000)
coreutils/date.c
coreutils/realpath.c
procps/pidof.c

index 6593df9..e9ec510 100644 (file)
@@ -282,10 +282,8 @@ int date_main(int argc, char **argv)
 
        {
                /* Print OUTPUT (after ALL that!) */
-               RESERVE_CONFIG_BUFFER(t_buff, 201);
-               strftime(t_buff, 200, date_fmt, &tm_time);
-               puts(t_buff);
-               RELEASE_CONFIG_BUFFER(t_buff);
+               strftime(bb_common_bufsiz1, 200, date_fmt, &tm_time);
+               puts(bb_common_bufsiz1);
        }
 
        return EXIT_SUCCESS;
index ec98221..90402c9 100644 (file)
@@ -30,7 +30,13 @@ int realpath_main(int argc, char **argv)
 {
        int retval = EXIT_SUCCESS;
 
+#if PATH_MAX > (BUFSIZ+1)
        RESERVE_CONFIG_BUFFER(resolved_path, PATH_MAX);
+# define resolved_path_MUST_FREE 1
+#else
+#define resolved_path bb_common_bufsiz1
+# define resolved_path_MUST_FREE 0
+#endif
 
        if (--argc == 0) {
                bb_show_usage();
@@ -46,7 +52,7 @@ int realpath_main(int argc, char **argv)
                }
        } while (--argc);
 
-#ifdef CONFIG_FEATURE_CLEAN_UP
+#if ENABLE_FEATURE_CLEAN_UP && resolved_path_MUST_FREE
        RELEASE_CONFIG_BUFFER(resolved_path);
 #endif
 
index acd2d51..c142e33 100644 (file)
@@ -60,7 +60,7 @@ extern int pidof_main(int argc, char **argv)
 #if ENABLE_FEATURE_PIDOF_OMIT
        /* fill omit list.  */
        {
-               RESERVE_CONFIG_BUFFER(getppid_str, 32);
+               char getppid_str[32];
                llist_t * omits_p = omits;
                while (omits_p) {
                        /* are we asked to exclude the parent's process ID?  */
@@ -76,8 +76,6 @@ extern int pidof_main(int argc, char **argv)
                        }
                        omits_p = omits_p->link;
                }
-               if (ENABLE_FEATURE_CLEAN_UP)
-                       RELEASE_CONFIG_BUFFER(getppid_str);
        }
 #endif
        /* Looks like everything is set to go.  */