agetty: move parse_speeds() to utils.c

Rename to agetty_parse_speeds() and move to utils.c alongside
the other parsing helpers.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/agetty-cmd/agetty.c b/agetty-cmd/agetty.c
index 00c06ab1fc8d1a2d6ff63da5067f81d1fe3aaa1c..7dcbe0cb2ed69f59e6aa685e64b35465f77dddec 100644 (file)
--- a/agetty-cmd/agetty.c
+++ b/agetty-cmd/agetty.c
@@ -105,7 +105,6 @@ static int inotify_fd = AGETTY_RELOAD_FDNONE;
        (((opt)->flags & (F_VCONSOLE|(flag))) == (flag))
 
 static void parse_args(int argc, char **argv, struct agetty_options *op);
-static void parse_speeds(struct agetty_options *op, char *arg);
 static int wait_for_term_input(struct agetty_issue *ie, int fd);
 static void do_prompt(struct agetty_issue *ie, struct agetty_options *op, struct termios *tp);
 static char *get_logname(struct agetty_issue *ie, struct agetty_options *op,
@@ -692,7 +691,7 @@ static void parse_args(int argc, char **argv, struct agetty_options *op)
        /* Accept "tty", "baudrate tty", and "tty baudrate". */
        if (is_speed(argv[optind])) {
                /* Assume BSD style speed. */
-               parse_speeds(op, argv[optind++]);
+               agetty_parse_speeds(op, argv[optind++]);
                if (argc < optind + 1) {
                        agetty_log_warn(_("not enough arguments"));
                        errx(EXIT_FAILURE, _("not enough arguments"));
@@ -703,7 +702,7 @@ static void parse_args(int argc, char **argv, struct agetty_options *op)
                if (argc > optind) {
                        char *v = argv[optind];
                        if (is_speed(v)) {
-                               parse_speeds(op, v);
+                               agetty_parse_speeds(op, v);
                                optind++;
                        }
                }
@@ -733,25 +732,6 @@ static void parse_args(int argc, char **argv, struct agetty_options *op)
        debug("exiting parseargs\n");
 }
 
-/* Parse alternate baud rates. */
-static void parse_speeds(struct agetty_options *op, char *arg)
-{
-       char *cp;
-       char *str = strdup(arg);
-
-       if (!str)
-               agetty_log_err(_("failed to allocate memory: %m"));
-
-       debug("entered parse_speeds:\n");
-       for (cp = strtok(str, ","); cp != NULL; cp = strtok((char *)0, ",")) {
-               if ((op->speeds[op->numspeed++] = agetty_bcode(cp)) <= 0)
-                       agetty_log_err(_("bad speed: %s"), cp);
-               if (op->numspeed >= MAX_SPEED)
-                       agetty_log_err(_("too many alternate speeds"));
-       }
-       debug("exiting parsespeeds\n");
-       free(str);
-}
 
 
 /* Show login prompt, optionally preceded by /etc/issue contents. */

diff --git a/agetty-cmd/agetty.h b/agetty-cmd/agetty.h
index d584b2d43257e37d022fca3715fbcb9c0600365e..7df992f0607f512cd94f32c2a70d3fd292b14f8d 100644 (file)
--- a/agetty-cmd/agetty.h
+++ b/agetty-cmd/agetty.h
@@ -112,6 +112,7 @@ extern void agetty_load_credentials(struct agetty_options *op);
 extern char *agetty_xgethostname(void);
 extern char *agetty_xgetdomainname(void);
 extern void agetty_update_utmp(struct agetty_options *op, const char *fakehost);
+extern void agetty_parse_speeds(struct agetty_options *op, char *arg);
 extern char *agetty_parse_initstring(const char *arg);
 
 enum {

diff --git a/agetty-cmd/utils.c b/agetty-cmd/utils.c
index 493ba6407e4dad509091dfa3cbb112336817ea99..0344e9a1ee079d633d331a2816d943b078679e82 100644 (file)
--- a/agetty-cmd/utils.c
+++ b/agetty-cmd/utils.c
@@ -156,6 +156,23 @@ void agetty_update_utmp(struct agetty_options *op, const char *fakehost)
 }
 #endif
 
+void agetty_parse_speeds(struct agetty_options *op, char *arg)
+{
+       char *cp;
+       char *str = strdup(arg);
+
+       if (!str)
+               agetty_log_err(_("failed to allocate memory: %m"));
+
+       for (cp = strtok(str, ","); cp != NULL; cp = strtok(NULL, ",")) {
+               if ((op->speeds[op->numspeed++] = agetty_bcode(cp)) <= 0)
+                       agetty_log_err(_("bad speed: %s"), cp);
+               if (op->numspeed >= MAX_SPEED)
+                       agetty_log_err(_("too many alternate speeds"));
+       }
+       free(str);
+}
+
 char *agetty_parse_initstring(const char *arg)
 {
        char ch, *str, *p, *q;