trace: use standard POSIX header for basename()

[project/procd.git] / utils / utils.c

diff --git a/utils/utils.c b/utils/utils.c
index e239eda5110ec4e38b88880d7b7d24341389e85e..e5b1297e6388831edeb00049311272a74b654507 100644 (file)
--- a/utils/utils.c
+++ b/utils/utils.c
@@ -135,10 +135,38 @@ blobmsg_list_equal(struct blobmsg_list *l1, struct blobmsg_list *l2)
        return true;
 }
 
-char* get_cmdline_val(const char* name, char* out, int len)
+char *get_active_console(char *out, int len)
+{
+       char line[CMDLINE_SIZE + 1];
+       int fd = open("/sys/class/tty/console/active", O_RDONLY);
+       ssize_t r;
+
+       if (fd < 0)
+               return NULL;
+
+       r = read(fd, line, sizeof(line) - 1);
+       line[CMDLINE_SIZE] = '\0';
+
+       close(fd);
+
+       if (r <= 0)
+               return NULL;
+
+       /* The active file is terminated by a newline which we need to strip */
+       char *newline = strtok(line, "\n");
+
+       if (newline != NULL) {
+               strncpy(out, newline, len);
+               return out;
+       }
+
+       return NULL;
+}
+
+char *get_cmdline_val_offset(const char *name, char *out, int len, int offset)
 {
        char line[CMDLINE_SIZE + 1], *c, *sptr;
-       int fd = open("/proc/cmdline", O_RDONLY);
+       int i, fd = open("/proc/cmdline", O_RDONLY);
        ssize_t r = read(fd, line, sizeof(line) - 1);
        close(fd);
 
@@ -147,13 +175,18 @@ char* get_cmdline_val(const char* name, char* out, int len)
 
        line[r] = 0;
 
-       for (c = strtok_r(line, " \t\n", &sptr); c;
+       for (i = 0, c = strtok_r(line, " \t\n", &sptr); c;
                        c = strtok_r(NULL, " \t\n", &sptr)) {
                char *sep = strchr(c, '=');
+               if (sep == NULL)
+                       continue;
+
                ssize_t klen = sep - c;
-               if (klen < 0 || strncmp(name, c, klen) || name[klen] != 0)
+               if (strncmp(name, c, klen) || name[klen] != 0)
                        continue;
 
+               if (i++ < offset)
+                       continue;
                strncpy(out, &sep[1], len);
                out[len-1] = 0;
                return out;
@@ -203,8 +236,8 @@ int patch_stdio(const char *device)
 
        for (fd = STDIN_FILENO; fd <= STDERR_FILENO; fd++) {
                if (patch_fd(device, fd, fd ? O_WRONLY : O_RDONLY)) {
-                       ERROR("Failed to redirect %s to %s: %d (%s)\n",
-                             fdname[fd], device, errno, strerror(errno));
+                       ERROR("Failed to redirect %s to %s: %m\n",
+                             fdname[fd], device);
                        rv = -1;
                }
        }