From 9bf93edd68742bbc9e814ec49c8a3a31ca8d3fff Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Mon, 30 Jun 2014 05:05:39 -0500 Subject: Promote makedevs to other. --- toys/other/makedevs.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++++ toys/pending/makedevs.c | 131 ------------------------------------------------ 2 files changed, 131 insertions(+), 131 deletions(-) create mode 100644 toys/other/makedevs.c delete mode 100644 toys/pending/makedevs.c (limited to 'toys') diff --git a/toys/other/makedevs.c b/toys/other/makedevs.c new file mode 100644 index 00000000..f6e7ece9 --- /dev/null +++ b/toys/other/makedevs.c @@ -0,0 +1,131 @@ +/* makedevs.c - Make ranges of device files. + * + * Copyright 2014 Bilal Qureshi + * Copyright 2014 Kyungwan Han + * + * No Standard + +USE_MAKEDEVS(NEWTOY(makedevs, "<1>1d:", TOYFLAG_USR|TOYFLAG_BIN)) + +config MAKEDEVS + bool "makedevs" + default y + help + usage: makedevs [-d device_table] rootdir + + Create a range of special files as specified in a device table. + + -d file containing device table (default reads from stdin) + + Each line of of the device table has the fields: + + Where name is the file name, and type is one of the following: + + b Block device + c Character device + d Directory + f Regular file + p Named pipe (fifo) + + Other fields specify permissions, user and group id owning the file, + and additional fields for device special files. Use '-' for blank entries, + unspecified fields are treated as '-'. +*/ + +#define FOR_makedevs +#include "toys.h" + +GLOBALS( + char *fname; +) + +void makedevs_main() +{ + int value, fd = 0, line_no, i; + char *line = NULL; + + // Open file and chdir, verbosely + xprintf("rootdir = %s\n", *toys.optargs); + if (toys.optflags & FLAG_d && strcmp(TT.fname, "-")) { + fd = xopen(TT.fname, O_RDONLY); + xprintf("table = %s\n", TT.fname); + } else xprintf("table = \n"); + xchdir(*toys.optargs); + + for (line_no = 0; (line = get_line(fd)); free(line)) { + char type=0, user[64], group[64], *node, *ptr = line; + unsigned int mode = 0755, major = 0, minor = 0, cnt = 0, incr = 0, + st_val = 0; + uid_t uid; + gid_t gid; + struct stat st; + + line_no++; + while (isspace(*ptr)) ptr++; + if (!*ptr || *ptr == '#') continue; + node = ptr; + + while (*ptr && !isspace(*ptr)) ptr++; + if (*ptr) *(ptr++) = 0; + *user = *group = 0; + sscanf(ptr, "%c %o %63s %63s %u %u %u %u %u", &type, &mode, + user, group, &major, &minor, &st_val, &incr, &cnt); + + // type order here needs to line up with actions[] order. + i = stridx("pcbdf", type); + if (i == -1) { + error_msg("line %d: bad type %c", line_no, type); + continue; + } else mode |= (mode_t[]){S_IFIFO, S_IFCHR, S_IFBLK, 0, 0}[i]; + + if (*user) { + struct passwd *usr; + + if (!(usr = getpwnam(user)) && isdigit(*user)) { + sscanf(user, "%u", &value); + usr = xgetpwuid(value); + } + if (!usr) error_exit("bad user '%s'", user); + uid = usr->pw_uid; + } else uid = getuid(); + + if (*group) { + struct group *grp; + + if (!(grp = getgrnam(group)) && isdigit(*group)) { + sscanf (group, "%u", &value); + grp = getgrgid(value); + } + if (!grp) error_exit("bad group '%s'", group); + gid = grp->gr_gid; + } else gid = getgid(); + + while (*node == '/') node++; // using relative path + + for (i = 0; (!cnt && !i) || i < cnt; i++) { + if (cnt) { + snprintf(toybuf, sizeof(toybuf), "%s%u", node, st_val + i); + ptr = toybuf; + } else ptr = node; + + if (type == 'd') { + if (mkpathat(AT_FDCWD, ptr, mode, 3)) { + perror_msg("can't create directory '%s'", ptr); + continue; + } + } else if (type == 'f') { + if (stat(ptr, &st) || !S_ISREG(st.st_mode)) { + perror_msg("line %d: file '%s' does not exist", line_no, ptr); + continue; + } + } else if (mknod(ptr, mode, makedev(major, minor + i*incr))) { + perror_msg("line %d: can't create node '%s'", line_no, ptr); + continue; + } + + if (chown(ptr, uid, gid) || chmod(ptr, mode)) + perror_msg("line %d: can't chown/chmod '%s'", line_no, ptr); + } + } + xclose(fd); +} diff --git a/toys/pending/makedevs.c b/toys/pending/makedevs.c deleted file mode 100644 index 4480f8c7..00000000 --- a/toys/pending/makedevs.c +++ /dev/null @@ -1,131 +0,0 @@ -/* makedevs.c - Make ranges of device files. - * - * Copyright 2014 Bilal Qureshi - * Copyright 2014 Kyungwan Han - * - * No Standard - -USE_MAKEDEVS(NEWTOY(makedevs, "<1>1d:", TOYFLAG_USR|TOYFLAG_BIN)) - -config MAKEDEVS - bool "makedevs" - default n - help - usage: makedevs [-d device_table] rootdir - - Create a range of special files as specified in a device table. - - -d file containing device table (default reads from stdin) - - Each line of of the device table has the fields: - - Where name is the file name, and type is one of the following: - - b Block device - c Character device - d Directory - f Regular file - p Named pipe (fifo) - - Other fields specify permissions, user and group id owning the file, - and additional fields for device special files. Use '-' for blank entries, - unspecified fields are treated as '-'. -*/ - -#define FOR_makedevs -#include "toys.h" - -GLOBALS( - char *fname; -) - -void makedevs_main() -{ - int value, fd = 0, line_no, i; - char *line = NULL; - - // Open file and chdir, verbosely - xprintf("rootdir = %s\n", *toys.optargs); - if (toys.optflags & FLAG_d && strcmp(TT.fname, "-")) { - fd = xopen(TT.fname, O_RDONLY); - xprintf("table = %s\n", TT.fname); - } else xprintf("table = \n"); - xchdir(*toys.optargs); - - for (line_no = 0; (line = get_line(fd)); free(line)) { - char type=0, user[64], group[64], *node, *ptr = line; - unsigned int mode = 0755, major = 0, minor = 0, cnt = 0, incr = 0, - st_val = 0; - uid_t uid; - gid_t gid; - struct stat st; - - line_no++; - while (isspace(*ptr)) ptr++; - if (!*ptr || *ptr == '#') continue; - node = ptr; - - while (*ptr && !isspace(*ptr)) ptr++; - if (*ptr) *(ptr++) = 0; - *user = *group = 0; - sscanf(ptr, "%c %o %63s %63s %u %u %u %u %u", &type, &mode, - user, group, &major, &minor, &st_val, &incr, &cnt); - - // type order here needs to line up with actions[] order. - i = stridx("pcbdf", type); - if (i == -1) { - error_msg("line %d: bad type %c", line_no, type); - continue; - } else mode |= (mode_t[]){S_IFIFO, S_IFCHR, S_IFBLK, 0, 0}[i]; - - if (*user) { - struct passwd *usr; - - if (!(usr = getpwnam(user)) && isdigit(*user)) { - sscanf(user, "%u", &value); - usr = xgetpwuid(value); - } - if (!usr) error_exit("bad user '%s'", user); - uid = usr->pw_uid; - } else uid = getuid(); - - if (*group) { - struct group *grp; - - if (!(grp = getgrnam(group)) && isdigit(*group)) { - sscanf (group, "%u", &value); - grp = getgrgid(value); - } - if (!grp) error_exit("bad group '%s'", group); - gid = grp->gr_gid; - } else gid = getgid(); - - while (*node == '/') node++; // using relative path - - for (i = 0; (!cnt && !i) || i < cnt; i++) { - if (cnt) { - snprintf(toybuf, sizeof(toybuf), "%s%u", node, st_val + i); - ptr = toybuf; - } else ptr = node; - - if (type == 'd') { - if (mkpathat(AT_FDCWD, ptr, mode, 3)) { - perror_msg("can't create directory '%s'", ptr); - continue; - } - } else if (type == 'f') { - if (stat(ptr, &st) || !S_ISREG(st.st_mode)) { - perror_msg("line %d: file '%s' does not exist", line_no, ptr); - continue; - } - } else if (mknod(ptr, mode, makedev(major, minor + i*incr))) { - perror_msg("line %d: can't create node '%s'", line_no, ptr); - continue; - } - - if (chown(ptr, uid, gid) || chmod(ptr, mode)) - perror_msg("line %d: can't chown/chmod '%s'", line_no, ptr); - } - } - xclose(fd); -} -- cgit v1.2.3