vtysh: move user_mode to header file, keep checkpatch happy

Signed-off-by: Lou Berger <lberger@labn.net>

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index dca5dafa84687d89d49dccdfa0a4b975b9f01800..f8493ae89bfd66defd465a555559b73b200404e7 100644 (file)
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -305,7 +305,6 @@ static int vtysh_execute_func(const char *line, int pager)
        int closepager = 0;
        int tried = 0;
        int saved_ret, saved_node;
-       extern int user_mode;
 
        /* Split readline string up into the vector. */
        vline = cmd_make_strvec(line);

diff --git a/vtysh/vtysh.h b/vtysh/vtysh.h
index 52a1a46105f188ba87e50bca88084d23798312da..9b21c3376ae87e27c3ef79c3bfff599570b5f581 100644 (file)
--- a/vtysh/vtysh.h
+++ b/vtysh/vtysh.h
@@ -100,4 +100,6 @@ extern int execute_flag;
 
 extern struct vty *vty;
 
+extern int user_mode;
+
 #endif /* VTYSH_H */

diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c
index b5cc1d21d1e89e577018941dc5a3b51ea33c8aaf..4de671b7faf1d7533e66cf18de36bf318abb5b3c 100644 (file)
--- a/vtysh/vtysh_main.c
+++ b/vtysh/vtysh_main.c
@@ -61,7 +61,7 @@ static char history_file[MAXPATHLEN];
 int execute_flag = 0;
 
 /* Flag to indicate if in user/unprivileged mode. */
-int user_mode = 0;
+int user_mode;
 
 /* For sigsetjmp() & siglongjmp(). */
 static sigjmp_buf jmpbuf;
@@ -315,6 +315,8 @@ int main(int argc, char **argv, char **env)
        realgid = getgid();
        suid_off();
 
+       user_mode = 0;          /* may be set in options processing */
+
        /* Preserve name of myself. */
        progname = ((p = strrchr(argv[0], '/')) ? ++p : argv[0]);
 
@@ -323,7 +325,8 @@ int main(int argc, char **argv, char **env)
 
        /* Option handling. */
        while (1) {
-               opt = getopt_long(argc, argv, "be:c:d:nf:mEhCwN:u", longopts, 0);
+               opt = getopt_long(argc, argv, "be:c:d:nf:mEhCwN:u",
+                                 longopts, 0);
 
                if (opt == EOF)
                        break;