hdparm: shrink rodata by ~250 bytes

[oweals/busybox.git] / coreutils / env.c

diff --git a/coreutils/env.c b/coreutils/env.c
index 1a8ad7c787fe95167b211c2d3084a53198ff1b34..dc8667181e9c015aca72a7d3e1f178a323766cc9 100644 (file)
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -5,19 +5,7 @@
  * Copyright (c) 1988, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
  * Original copyright notice is retained at the end of this file.
  *
@@ -38,54 +26,51 @@
  * - correct "-" option usage
  * - multiple "-u unsetenv" support
  * - GNU long option support
- * - save errno after exec failed before bb_perror_msg()
+ * - use xfunc_error_retval
  */
 
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
 #include <getopt.h> /* struct option */
-#include "busybox.h"
+extern char **environ;
 
+#include "libbb.h"
 
-static const struct option env_long_options[] = {
-       { "ignore-environment", 0, NULL, 'i' },
-       { "unset", 1, NULL, 'u' },
-       { 0, 0, 0, 0 }
-};
+#if ENABLE_FEATURE_ENV_LONG_OPTIONS
+static const char env_longopts[] ALIGN1 =
+       "ignore-environment\0" No_argument       "i"
+       "unset\0"              Required_argument "u"
+       ;
+#endif
 
-extern int env_main(int argc, char** argv)
+int env_main(int argc, char** argv);
+int env_main(int argc, char** argv)
 {
-       char **ep, *p;
-       char *cleanenv[1] = { NULL };
-       unsigned long opt;
+       /* cleanenv was static - why? */
+       char *cleanenv[1];
+       char **ep;
+       unsigned opt;
        llist_t *unset_env = NULL;
-       extern char **environ;
-
-       bb_opt_complementally = "u*";
-       bb_applet_long_options = env_long_options;
-
-       opt = bb_getopt_ulflags(argc, argv, "+iu:", &unset_env);
 
+       opt_complementary = "u::";
+#if ENABLE_FEATURE_ENV_LONG_OPTIONS
+       applet_long_options = env_longopts;
+#endif
+       opt = getopt32(argc, argv, "+iu:", &unset_env);
        argv += optind;
-       if (*argv && (argv[0][0] == '-') && !argv[0][1]) {
+       if (*argv && LONE_DASH(argv[0])) {
                opt |= 1;
                ++argv;
        }
-
-       if(opt & 1)
+       if (opt & 1) {
+               cleanenv[0] = NULL;
                environ = cleanenv;
-       else if(opt & 2) {
-               while(unset_env) {
+       } else {
+               while (unset_env) {
                        unsetenv(unset_env->data);
                        unset_env = unset_env->link;
                }
        }
 
-       while (*argv && ((p = strchr(*argv, '=')) != NULL)) {
+       while (*argv && (strchr(*argv, '=') != NULL)) {
                if (putenv(*argv) < 0) {
                        bb_perror_msg_and_die("putenv");
                }
@@ -93,19 +78,17 @@ extern int env_main(int argc, char** argv)
        }
 
        if (*argv) {
-               int er;
-
-               execvp(*argv, argv);
-               er = errno;
-               bb_perror_msg("%s", *argv);     /* Avoid multibyte problems. */
-               return (er == ENOENT) ? 127 : 126;   /* SUSv3-mandated exit codes. */
+               BB_EXECVP(*argv, argv);
+               /* SUSv3-mandated exit codes. */
+               xfunc_error_retval = (errno == ENOENT) ? 127 : 126;
+               bb_perror_msg_and_die("%s", *argv);
        }
 
        for (ep = environ; *ep; ep++) {
                puts(*ep);
        }
 
-       bb_fflush_stdout_and_exit(0);
+       fflush_stdout_and_exit(0);
 }
 
 /*