env: Rename setenv() to env_set()

[oweals/u-boot.git] / tools / env / fw_env_main.c

diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c
index 7a17b28f40bc3109a2eb7424f9e45f086127f367..6e278ca80b4dd5676d2364657d7bb35b0658c751 100644 (file)
--- a/tools/env/fw_env_main.c
+++ b/tools/env/fw_env_main.c
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 #include <sys/file.h>
 #include <unistd.h>
+#include "fw_env_private.h"
 #include "fw_env.h"
 
 #define CMD_PRINTENV   "fw_printenv"
@@ -46,6 +47,7 @@ static struct option long_options[] = {
        {"help", no_argument, NULL, 'h'},
        {"script", required_argument, NULL, 's'},
        {"noheader", required_argument, NULL, 'n'},
+       {"lock", required_argument, NULL, 'l'},
        {NULL, 0, NULL, 0}
 };
 
@@ -72,10 +74,11 @@ void usage_printenv(void)
                " -c, --config         configuration file, default:" CONFIG_FILE "\n"
 #endif
                " -n, --noheader       do not repeat variable name in output\n"
+               " -l, --lock           lock node, default:/var/lock\n"
                "\n");
 }
 
-void usage_setenv(void)
+void usage_env_set(void)
 {
        fprintf(stderr,
                "Usage: fw_setenv [OPTIONS]... [VARIABLE]...\n"
@@ -88,6 +91,7 @@ void usage_setenv(void)
 #ifdef CONFIG_FILE
                " -c, --config         configuration file, default:" CONFIG_FILE "\n"
 #endif
+               " -l, --lock           lock node, default:/var/lock\n"
                " -s, --script         batch mode to minimize writes\n"
                "\n"
                "Examples:\n"
@@ -119,7 +123,7 @@ static void parse_common_args(int argc, char *argv[])
        env_opts.config_file = CONFIG_FILE;
 #endif
 
-       while ((c = getopt_long(argc, argv, ":a:c:h", long_options, NULL)) !=
+       while ((c = getopt_long(argc, argv, ":a:c:l:h", long_options, NULL)) !=
               EOF) {
                switch (c) {
                case 'a':
@@ -134,8 +138,11 @@ static void parse_common_args(int argc, char *argv[])
                        env_opts.config_file = optarg;
                        break;
 #endif
+               case 'l':
+                       env_opts.lockname = optarg;
+                       break;
                case 'h':
-                       do_printenv ? usage_printenv() : usage_setenv();
+                       do_printenv ? usage_printenv() : usage_env_set();
                        exit(EXIT_SUCCESS);
                        break;
                default:
@@ -155,8 +162,8 @@ int parse_printenv_args(int argc, char *argv[])
 
        parse_common_args(argc, argv);
 
-       while ((c = getopt_long(argc, argv, "a:c:ns:h", long_options, NULL)) !=
-              EOF) {
+       while ((c = getopt_long(argc, argv, "a:c:ns:l:h", long_options, NULL))
+               != EOF) {
                switch (c) {
                case 'n':
                        noheader = 1;
@@ -164,6 +171,7 @@ int parse_printenv_args(int argc, char *argv[])
                case 'a':
                case 'c':
                case 'h':
+               case 'l':
                        /* ignore common options */
                        break;
                default: /* '?' */
@@ -181,8 +189,8 @@ int parse_setenv_args(int argc, char *argv[])
 
        parse_common_args(argc, argv);
 
-       while ((c = getopt_long(argc, argv, "a:c:ns:h", long_options, NULL)) !=
-              EOF) {
+       while ((c = getopt_long(argc, argv, "a:c:ns:l:h", long_options, NULL))
+               != EOF) {
                switch (c) {
                case 's':
                        script_file = optarg;
@@ -190,10 +198,11 @@ int parse_setenv_args(int argc, char *argv[])
                case 'a':
                case 'c':
                case 'h':
+               case 'l':
                        /* ignore common options */
                        break;
                default: /* '?' */
-                       usage_setenv();
+                       usage_env_set();
                        exit(EXIT_FAILURE);
                        break;
                }
@@ -203,7 +212,7 @@ int parse_setenv_args(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
-       const char *lockname = "/var/lock/" CMD_PRINTENV ".lock";
+       char *lockname = "/var/lock/" CMD_PRINTENV ".lock";
        int lockfd = -1;
        int retval = EXIT_SUCCESS;
        char *_cmdname;
@@ -235,6 +244,18 @@ int main(int argc, char *argv[])
        argc -= optind;
        argv += optind;
 
+       if (env_opts.lockname) {
+               lockname = malloc(sizeof(env_opts.lockname) +
+                               sizeof(CMD_PRINTENV) + 10);
+               if (!lockname) {
+                       fprintf(stderr, "Unable allocate memory");
+                       exit(EXIT_FAILURE);
+               }
+
+               sprintf(lockname, "%s/%s.lock",
+                       env_opts.lockname, CMD_PRINTENV);
+       }
+
        lockfd = open(lockname, O_WRONLY | O_CREAT | O_TRUNC, 0666);
        if (-1 == lockfd) {
                fprintf(stderr, "Error opening lock file %s\n", lockname);
@@ -252,7 +273,7 @@ int main(int argc, char *argv[])
                        retval = EXIT_FAILURE;
        } else {
                if (!script_file) {
-                       if (fw_setenv(argc, argv, &env_opts) != 0)
+                       if (fw_env_set(argc, argv, &env_opts) != 0)
                                retval = EXIT_FAILURE;
                } else {
                        if (fw_parse_script(script_file, &env_opts) != 0)
@@ -260,6 +281,9 @@ int main(int argc, char *argv[])
                }
        }
 
+       if (env_opts.lockname)
+               free(lockname);
+
        flock(lockfd, LOCK_UN);
        close(lockfd);
        return retval;