s6-linux-utils-2.5.1.1/0002755000000000000000000000000013553343654011404 5ustar s6-linux-utils-2.5.1.1/AUTHORS0000644000000000000000000000052713354205520012442 0ustar Main author: Laurent Bercot Contributors: Eric Le Bihan Luis Ressel John Regan Thanks to: Dan J. Bernstein Jorge Almeida Olivier Brunel Natanael Copa s6-linux-utils-2.5.1.1/INSTALL0000644000000000000000000001366413553360527012443 0ustar Build Instructions ------------------ * Requirements ------------ - A Linux-based system with a standard C development environment - GNU make version 3.81 or later - skalibs version 2.9.1.0 or later: http://skarnet.org/software/skalibs/ This software is Linux-specific. It will run on a Linux kernel, version 3.5 or later. * Standard usage -------------- ./configure && make && sudo make install will work for most users. It will install the binaries in /bin. You can strip the binaries and libraries of their extra symbols via "make strip" before the "make install" phase. It will shave a few bytes off them. * Customization ------------- You can customize paths via flags given to configure. See ./configure --help for a list of all available configure options. * Environment variables --------------------- Controlling a build process via environment variables is a big and dangerous hammer. You should try and pass flags to configure instead; nevertheless, a few standard environment variables are recognized. If the CC environment variable is set, its value will override compiler detection by configure. The --host=HOST option will still add a HOST- prefix to the value of CC. The values of CFLAGS, CPPFLAGS and LDFLAGS will be appended to flags auto-detected by configure. To entirely override the flags set by configure instead, use make variables. * Make variables -------------- You can invoke make with a few variables for more configuration. CC, CFLAGS, CPPFLAGS, LDFLAGS, LDLIBS, AR, RANLIB, STRIP, INSTALL and CROSS_COMPILE can all be overridden on the make command line. This is an even bigger hammer than running ./configure with environment variables, so it is advised to only do this when it is the only way of obtaining the behaviour you want. DESTDIR can be given on the "make install" command line in order to install to a staging directory. * Shared libraries ---------------- Software from skarnet.org is small enough that shared libraries are generally not worth using. Static linking is simpler and incurs less runtime overhead and less points of failure: so by default, shared libraries are not built and binaries are linked against the static versions of the skarnet.org libraries. Nevertheless, you can: * build shared libraries: --enable-shared * link binaries against shared libraries: --disable-allstatic * Static binaries --------------- By default, binaries are linked against static versions of all the libraries they depend on, except for the libc. You can enforce linking against the static libc with --enable-static-libc. Be aware that the GNU libc behaves badly with static linking and produces huge executables, which is why it is not the default. Other libcs are better suited to static linking, for instance musl: http://musl-libc.org/ * Cross-compilation ----------------- skarnet.org packages centralize all the difficulty of cross-compilation in one place: skalibs. Once you have cross-compiled skalibs, the rest is easy. * Use the --host=HOST option to configure, HOST being the triplet for your target. * Make sure your cross-toolchain binaries (i.e. prefixed with HOST-) are accessible via your PATH environment variable. * Make sure to use the correct version of skalibs for your target, and the correct sysdeps directory, making use of the --with-include, --with-lib, --with-dynlib and --with-sysdeps options as necessary. * The slashpackage convention --------------------------- The slashpackage convention (http://cr.yp.to/slashpackage.html) is a package installation scheme that provides a few guarantees over other conventions such as the FHS, for instance fixed absolute pathnames. skarnet.org packages support it: use the --enable-slashpackage option to configure, or --enable-slashpackage=DIR for a prefixed DIR/package tree. This option will activate slashpackage support during the build and set slashpackage-compatible installation directories. If $package_home is the home of the package, defined as DIR/package/$category/$package-$version with the variables read from the package/info file, then: --dynlibdir is set to $package_home/library.so --bindir is set to $package_home/command --sbindir is also set to $package_home/command (slashpackage differentiates root-only binaries by their Unix rights, not their location in the filesystem) --libexecdir is also set to $package_home/command (slashpackage does not need a specific directory for internal binaries) --libdir is set to $package_home/library --includedir is set to $package_home/include --prefix is pretty much ignored when you use --enable-slashpackage. You should probably not use both --enable-slashpackage and --prefix. When using slashpackage, two additional Makefile targets are available after "make install": - "make update" changes the default version of the software to the freshly installed one. (This is useful when you have several installed versions of the same software, which slashpackage supports.) - "make -L global-links" adds links from /command and /library.so to the default version of the binaries and shared libraries. The "-L" option to make is necessary because targets are symbolic links, and the default make behaviour is to check the pointed file's timestamp and not the symlink's timestamp. * Absolute pathnames ------------------ You may want to use fixed absolute pathnames even if you're not following the slashpackage convention: for instance, the Nix packaging system prefers calling binaries with immutable paths rather than rely on PATH resolution. If you are in that case, use the --enable-absolute-paths option to configure. This will ensure that programs calling binaries from this package will call them with their full installation path (in bindir) without relying on a PATH search. * Out-of-tree builds ------------------ skarnet.org packages do not support out-of-tree builds. They are small, so it does not cost much to duplicate the entire source tree if parallel builds are needed. s6-linux-utils-2.5.1.1/README0000644000000000000000000000154413553367227012270 0ustar s6-linux-utils - tiny Linux-specific utilities ---------------------------------------------- s6-linux-utils is a set of tiny Linux-specific utilities, some performing well-known tasks such as mount and swapon, other being nonstandard but typically useful for a s6-based system. They have been optimized for simplicity and small size. They were designed for embedded systems and other constrained environments, but they work on any Linux system. Of particular interest in this package are the following programs: - s6-ps, an independent ps implementation See https://skarnet.org/software/s6-linux-utils/ for details. * Installation ------------ See the INSTALL file. * Contact information ------------------- Laurent Bercot Please use the mailing-list for questions about s6-linux-utils. s6-linux-utils-2.5.1.1/src/0000755000000000000000000000000012407014653012160 5ustar s6-linux-utils-2.5.1.1/src/minutils/0000755000000000000000000000000013541513654014031 5ustar s6-linux-utils-2.5.1.1/src/minutils/s6ps_statparse.c0000644000000000000000000000707513073623252017163 0ustar /* ISC license. */ #include #include #include #include #include #include #include #include "s6-ps.h" /* going to great lengths to avoid scanf(), but all this code is still smaller than scanf (no floating point parsing etc.) */ #define STATVARS 49 typedef size_t scanfunc_t (char const *, void *) ; typedef scanfunc_t *scanfunc_t_ref ; static size_t f64 (char const *s, void *u64) { uint64_t *u = u64 ; return uint64_scan(s, u) ; } #define DEFUNU(name, type) \ static size_t name (char const *s, void *p) \ { \ uint64_t u ; \ size_t len = uint64_scan(s, &u) ; \ *(type *)p = u ; \ return len ; \ } \ #define DEFUNS(name, type) \ static size_t name (char const *s, void *p) \ { \ int64_t d ; \ size_t len = int64_scan(s, &d) ; \ *(type *)p = d ; \ return len ; \ } \ DEFUNS(fint, int) DEFUNS(fpid, pid_t) DEFUNU(fdev, dev_t) static scanfunc_t_ref scanfuncs[STATVARS] = { &fpid, /* ppid */ &fpid, /* pgrp */ &fpid, /* session */ &fdev, /* tty_nr */ &fpid, /* tpgid */ &f64, /* flags */ &f64, /* minflt */ &f64, /* cminflt */ &f64, /* majflt */ &f64, /* cmajflt */ &f64, /* utime */ &f64, /* stime */ &f64, /* cutime */ &f64, /* cstime */ &fint, /* priority */ &fint, /* nice */ &f64, /* num_threads */ &f64, /* itrealvalue */ &f64, /* starttime */ &f64, /* vsize */ &f64, /* rss */ &f64, /* rsslim */ &f64, /* startcode */ &f64, /* endcode */ &f64, /* startstack */ &f64, /* kstkesp */ &f64, /* kstkeip */ &f64, /* signal */ &f64, /* blocked */ &f64, /* sigignore */ &f64, /* sigcatch */ &f64, /* wchan */ &f64, /* nswap */ &f64, /* cnswap */ &fint, /* exit_signal */ &f64, /* processor */ &f64, /* rt_priority */ &f64, /* policy */ &f64, /* delayacct_blkio_ticks */ &f64, /* guest_time */ &f64, /* cguest_time */ &f64, /* start_data */ &f64, /* end_data */ &f64, /* start_brk */ &f64, /* arg_start */ &f64, /* arg_end */ &f64, /* env_start */ &f64, /* env_end */ &fint /* exit_code */ } ; int s6ps_statparse (pscan_t *p) { uint64_t dummy64 ; int dummyint ; size_t pos = 0 ; void *scanresults[STATVARS] = { &p->ppid, &p->pgrp, &p->session, &p->ttynr, &p->tpgid, &dummy64, &dummy64, &dummy64, &dummy64, &dummy64, &p->utime, &p->stime, &p->cutime, &p->cstime, &p->prio, &p->nice, &p->threads, &dummy64, &p->start, &p->vsize, &p->rss, &p->rsslim, &dummy64, &dummy64, &dummy64, &dummy64, &dummy64, &dummy64, &dummy64, &dummy64, &dummy64, &p->wchan, &dummy64, &dummy64, &dummy64, &p->cpuno, &p->rtprio, &p->policy, &dummy64, &dummy64, &dummy64, &dummy64, &dummy64, &dummy64, &dummy64, &dummy64, &dummy64, &dummy64, &dummyint } ; unsigned int i = 0 ; if (!p->statlen) return 0 ; pos = uint64_scan(p->data.s, &dummy64) ; if (!pos) return 0 ; if (dummy64 != p->pid) return 0 ; if (pos + 5 + p->commlen > p->statlen) return 0 ; if (p->data.s[pos++] != ' ') return 0 ; if (p->data.s[pos++] != '(') return 0 ; pos += p->commlen ; if (p->data.s[pos++] != ')') return 0 ; if (p->data.s[pos++] != ' ') return 0 ; p->state = pos++ ; for (; i < STATVARS ; i++) { size_t w ; if (pos + 1 > p->statlen) return 0 ; if (p->data.s[pos++] != ' ') return 0 ; w = (*scanfuncs[i])(p->data.s + pos, scanresults[i]) ; if (!w) return 0 ; pos += w ; } return 1 ; } s6-linux-utils-2.5.1.1/src/minutils/s6ps_otree.c0000644000000000000000000000531613066200327016263 0ustar /* ISC license. */ #include #include #include "s6-ps.h" typedef struct ptreeiter_s ptreeiter_t, *ptreeiter_t_ref ; struct ptreeiter_s { unsigned int *childlist ; unsigned int const *childindex ; unsigned int const *ppindex ; unsigned int *cpos ; } ; typedef struct pstuff_s pstuff_t, *pstuff_t_ref ; struct pstuff_s { unsigned int *orderedlist ; pscan_t *p ; unsigned int const *childlist ; unsigned int const *childindex ; unsigned int const *nchild ; } ; static int fillchildlist (unsigned int i, unsigned int h, void *x) { ptreeiter_t *pt = x ; unsigned int j = pt->ppindex[i] ; pt->childlist[pt->childindex[j] + pt->cpos[j]++] = i ; (void)h ; return 1 ; } static void fillo_tree_rec (pstuff_t *blah, unsigned int root, signed int h) { static unsigned int j = 0 ; unsigned int i = !blah->p[root].pid ; if (blah->p[root].pid == 1) h = -1 ; blah->p[root].height = (h > 0) ? h : 0 ; blah->orderedlist[j++] = root ; for (; i < blah->nchild[root] ; i++) fillo_tree_rec(blah, blah->childlist[blah->childindex[root] + i], h+1) ; } /* Fills up orderedlist with the right indices to print a process tree. O(n log n) time, O(n) space, all in the stack. */ void s6ps_otree (pscan_t *p, unsigned int n, avltreen *pidtree, unsigned int *orderedlist) { unsigned int childlist[n] ; unsigned int childindex[n] ; unsigned int nchild[n] ; unsigned int i = 0 ; for (; i < n ; i++) nchild[i] = 0 ; /* Compute the ppid tree */ for (i = 0 ; i < n ; i++) { uint32_t k ; if (!avltreen_search(pidtree, &p[i].ppid, &k)) k = n-1 ; orderedlist[i] = k ; /* using orderedlist as ppindex */ nchild[k]++ ; } { unsigned int j = 0 ; for (i = 0 ; i < n ; i++) { childindex[i] = j ; j += nchild[i] ; } } /* Fill the childlist by increasing pids so it is sorted */ { unsigned int cpos[n] ; ptreeiter_t blah = { .childlist = childlist, .childindex = childindex, .ppindex = orderedlist, .cpos = cpos } ; for (i = 0 ; i < n ; i++) cpos[i] = 0 ; avltreen_iter_nocancel(pidtree, avltreen_totalsize(pidtree), &fillchildlist, &blah) ; } /* If we have init, make it the last in the orphan list */ if (n > 1 && p[childlist[childindex[n-1]+1]].pid == 1) { unsigned int pos1 = childlist[childindex[n-1] + 1] ; for (i = 2 ; i < nchild[n-1] ; i++) childlist[childindex[n-1]+i-1] = childlist[childindex[n-1]+i] ; childlist[childindex[n-1]+nchild[n-1]-1] = pos1 ; } /* Finally, fill orderedlist by walking the childindex tree. */ { pstuff_t blah = { .orderedlist = orderedlist, .p = p, .childlist = childlist, .childindex = childindex, .nchild = nchild } ; fillo_tree_rec(&blah, n-1, -1) ; } } s6-linux-utils-2.5.1.1/src/minutils/s6-ps.h0000644000000000000000000000626113073426444015157 0ustar /* ISC license. */ #ifndef _S6PS_H_ #define _S6PS_H_ #include #include #include #include #include #include typedef struct dius_s dius_t, *dius_t_ref ; struct dius_s { uint32_t left ; size_t right ; } ; #define DIUS_ZERO { .left = 0, .right = 0 } /* pfield: the output fields */ typedef enum pfield_e pfield_t, *pfield_t_ref ; enum pfield_e { PFIELD_PID, PFIELD_COMM, PFIELD_STATE, PFIELD_PPID, PFIELD_PGRP, PFIELD_SESSION, PFIELD_TTY, PFIELD_TPGID, PFIELD_UTIME, PFIELD_STIME, PFIELD_CUTIME, PFIELD_CSTIME, PFIELD_PRIO, PFIELD_NICE, PFIELD_THREADS, PFIELD_START, PFIELD_VSIZE, PFIELD_RSS, PFIELD_RSSLIM, PFIELD_CPUNO, PFIELD_RTPRIO, PFIELD_RTPOLICY, PFIELD_USER, PFIELD_GROUP, PFIELD_PMEM, PFIELD_WCHAN, PFIELD_ARGS, PFIELD_ENV, PFIELD_PCPU, PFIELD_TTIME, PFIELD_CTTIME, PFIELD_TSTART, PFIELD_CPCPU, PFIELD_PHAIL } ; extern char const *const *s6ps_opttable ; extern char const *const *s6ps_fieldheaders ; /* pscan: the main structure */ typedef struct pscan_s pscan_t, *pscan_t_ref ; struct pscan_s { stralloc data ; pid_t pid ; signed int height ; size_t statlen ; size_t commlen ; size_t cmdlen ; size_t envlen ; uid_t uid ; gid_t gid ; pid_t ppid ; unsigned int state ; pid_t pgrp ; pid_t session ; dev_t ttynr ; pid_t tpgid ; uint64_t utime ; uint64_t stime ; uint64_t cutime ; uint64_t cstime ; int prio ; int nice ; uint64_t threads ; uint64_t start ; uint64_t vsize ; uint64_t rss ; uint64_t rsslim ; uint64_t wchan ; uint64_t cpuno ; uint64_t rtprio ; uint64_t policy ; } ; #define PSCAN_ZERO \ { \ .data = STRALLOC_ZERO, \ .pid = 0, \ .height = 0, \ .statlen = 0, \ .commlen = 0, \ .cmdlen = 0, \ .envlen = 0, \ .uid = 0, \ .gid = 0, \ .ppid = 0, \ .state = 0, \ .pgrp = 0, \ .session = 0, \ .ttynr = 0, \ .tpgid = -1, \ .utime = 0, \ .stime = 0, \ .cutime = 0, \ .cstime = 0, \ .prio = 0, \ .nice = 0, \ .threads = 0, \ .start = 0, \ .vsize = 0, \ .rss = 0, \ .rsslim = 0, \ .wchan = 0, \ .cpuno = 0, \ .rtprio = 0, \ .policy = 0 \ } extern int s6ps_statparse (pscan_t *) ; extern void s6ps_otree (pscan_t *, unsigned int, avltreen *, unsigned int *) ; extern int s6ps_compute_boottime (pscan_t *, unsigned int) ; typedef int pfieldfmt_func_t (pscan_t *, size_t *, size_t *) ; typedef pfieldfmt_func_t *pfieldfmt_func_t_ref ; extern pfieldfmt_func_t_ref *s6ps_pfield_fmt ; extern void *left_dtok (unsigned int, void *) ; extern int uint32_cmp (void const *, void const *, void *) ; extern int s6ps_pwcache_init (void) ; extern void s6ps_pwcache_finish (void) ; extern int s6ps_pwcache_lookup (stralloc *, uid_t) ; extern int s6ps_grcache_init (void) ; extern void s6ps_grcache_finish (void) ; extern int s6ps_grcache_lookup (stralloc *, gid_t) ; extern int s6ps_ttycache_init (void) ; extern void s6ps_ttycache_finish (void) ; extern int s6ps_ttycache_lookup (stralloc *, dev_t) ; extern int s6ps_wchan_init (char const *) ; extern void s6ps_wchan_finish (void) ; extern int s6ps_wchan_lookup (stralloc *, uint64_t) ; #endif s6-linux-utils-2.5.1.1/src/minutils/s6-hostname.c0000644000000000000000000000142313061734243016335 0ustar /* ISC license. */ #ifndef _BSD_SOURCE #define _BSD_SOURCE #endif #include #include #include #include #include #include #define USAGE "s6-hostname [ hostname ]" static int getit (void) { stralloc sa = STRALLOC_ZERO ; if (sagethostname(&sa) < 0) strerr_diefu1sys(111, "get hostname") ; sa.s[sa.len++] = '\n' ; if (allwrite(1, sa.s, sa.len) < sa.len) strerr_diefu1sys(111, "write to stdout") ; return 0 ; } static int setit (char const *h) { if (sethostname(h, strlen(h)) < 0) strerr_diefu1sys(111, "set hostname") ; return 0 ; } int main (int argc, char const *const *argv) { PROG = "s6-hostname" ; return (argc < 2) ? getit() : setit(argv[1]) ; } s6-linux-utils-2.5.1.1/src/minutils/s6ps_grcache.c0000644000000000000000000000320313066177766016556 0ustar /* ISC license. */ #include #include #include #include #include #include #include #include #include "s6-ps.h" static avltree grcache_tree = AVLTREE_ZERO ; static genalloc grcache_index = GENALLOC_ZERO ; int s6ps_grcache_init (void) { avltree_init(&grcache_tree, 5, 3, 8, &left_dtok, &uint32_cmp, &grcache_index) ; return 1 ; } void s6ps_grcache_finish (void) { avltree_free(&grcache_tree) ; genalloc_free(dius_t, &grcache_index) ; } int s6ps_grcache_lookup (stralloc *sa, gid_t gid) { int wasnull = !satmp.s ; dius_t d = { .left = (uint32_t)gid, .right = satmp.len } ; uint32_t i ; if (!avltree_search(&grcache_tree, &d.left, &i)) { struct group *gr ; unsigned int n = genalloc_len(dius_t, &grcache_index) ; errno = 0 ; gr = getgrgid(gid) ; if (!gr) { if (errno) return 0 ; if (!stralloc_readyplus(&satmp, UINT_FMT + 2)) return 0 ; stralloc_catb(&satmp, "(", 1) ; satmp.len += uint_fmt(satmp.s + satmp.len, gid) ; stralloc_catb(&satmp, ")", 2) ; } else if (!stralloc_cats(&satmp, gr->gr_name) || !stralloc_0(&satmp)) return 0 ; if (!genalloc_append(dius_t, &grcache_index, &d)) goto err ; if (!avltree_insert(&grcache_tree, n)) { genalloc_setlen(dius_t, &grcache_index, n) ; goto err ; } i = n ; } return stralloc_cats(sa, satmp.s + genalloc_s(dius_t, &grcache_index)[i].right) ; err: { int e = errno ; if (wasnull) stralloc_free(&satmp) ; else satmp.len = d.right ; errno = e ; } return 0 ; } s6-linux-utils-2.5.1.1/src/minutils/s6-mount.c0000644000000000000000000001227713264125220015664 0ustar /* ISC license. */ #include #include #include #include #include #include #include #include #include #include #include "mount-constants.h" #define USAGE "s6-mount -a [ -z fstab ] | s6-mount [ -n ] [ -t type ] [ -o option[,option...] ]... device mountpoint" #define BUFSIZE 4096 #define SWITCH(opt) do #define HCTIWS(opt) while(0) ; #define CASE(s) if (n == sizeof(s) - 1 && !strncmp(opt, (s), n)) static void scanopt (stralloc *data, unsigned long *flags, char const *opt) { for (;;) { unsigned int n = str_chr(opt, ',') ; SWITCH(opt) { CASE("defaults") { *flags = MS_MGC_VAL ; break ; } CASE("ro") { *flags |= MS_RDONLY ; break ; } CASE("rw") { *flags &= ~MS_RDONLY ; break ; } CASE("remount") { *flags |= MS_REMOUNT ; break ; } CASE("sync") { *flags |= MS_SYNCHRONOUS ; break ; } CASE("async") { *flags &= ~MS_SYNCHRONOUS ; break ; } CASE("nodev") { *flags |= MS_NODEV ; break ; } CASE("dev") { *flags &= ~MS_NODEV ; break ; } CASE("noexec") { *flags |= MS_NOEXEC ; break ; } CASE("exec") { *flags &= ~MS_NOEXEC ; break ; } CASE("nosuid") { *flags |= MS_NOSUID ; break ; } CASE("suid") { *flags &= ~MS_NOSUID ; break ; } CASE("noatime") { *flags |= MS_NOATIME ; break ; } CASE("atime") { *flags &= ~MS_NOATIME ; break ; } CASE("nodiratime") { *flags |= MS_NODIRATIME ; break ; } CASE("diratime") { *flags &= ~MS_NODIRATIME ; break ; } CASE("strictatime") { *flags |= MS_STRICTATIME ; break ; } CASE("nostrictatime") { *flags &= ~MS_STRICTATIME ; break ; } CASE("bind") { *flags |= MS_BIND ; break ; } CASE("nobind") { *flags &= ~MS_BIND ; break ; } CASE("move") { *flags |= MS_MOVE ; break ; } CASE("nomove") { *flags &= ~MS_MOVE ; break ; } CASE("dirsync") { *flags |= MS_DIRSYNC ; break ; } CASE("nodirsync") { *flags &= ~MS_DIRSYNC ; break ; } CASE("mandlock") { *flags |= MS_MANDLOCK ; break ; } CASE("nomandlock") { *flags &= ~MS_MANDLOCK ; break ; } CASE("silent") { *flags |= MS_SILENT ; break ; } CASE("nosilent") { *flags &= ~MS_SILENT ; break ; } #ifdef MS_LAZYTIME CASE("lazytime") { *flags |= MS_LAZYTIME ; break ; } CASE("nolazytime") { *flags &= ~MS_LAZYTIME ; break ; } #endif CASE("shared") { *flags &= ~(MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE) ; *flags |= MS_SHARED ; break ; } CASE("private") { *flags &= ~(MS_SHARED | MS_SLAVE | MS_UNBINDABLE) ; *flags |= MS_PRIVATE ; break ; } CASE("slave") { *flags &= ~(MS_SHARED | MS_PRIVATE | MS_UNBINDABLE) ; *flags |= MS_SLAVE ; break ; } CASE("unbindable") { *flags &= ~(MS_SHARED | MS_PRIVATE | MS_SLAVE) ; *flags |= MS_UNBINDABLE ; break ; } if ((data->s && data->len && !stralloc_catb(data, ",", 1)) || !stralloc_catb(data, opt, n)) strerr_diefu1sys(111, "build data string") ; } HCTIWS(opt) opt += n ; if (!*opt) break ; if (*opt != ',') strerr_dief1x(100, "unrecognized option") ; opt++ ; } } static int mountall (char const *fstab) { struct mntent *d ; int e = 0 ; FILE *yuck = setmntent(fstab, "r") ; if (!yuck) strerr_diefu2sys(111, "open ", fstab) ; while ((d = getmntent(yuck))) { unsigned long flags = MS_MGC_VAL ; stralloc data = STRALLOC_ZERO ; scanopt(&data, &flags, d->mnt_opts) ; if (!stralloc_0(&data)) strerr_diefu1sys(111, "build data string") ; #ifdef DEBUG strerr_warni4x("mounting ", d->mnt_fsname, " on ", d->mnt_dir) ; #endif if (mount(d->mnt_fsname, d->mnt_dir, d->mnt_type, flags, data.s) == -1) { e++ ; strerr_warnwu4sys("mount ", d->mnt_fsname, " on ", d->mnt_dir) ; } stralloc_free(&data) ; } endmntent(yuck) ; return e ; } int main (int argc, char const *const *argv) { stralloc data = STRALLOC_ZERO ; unsigned long flags = MS_MGC_VAL ; char const *fstype = "none" ; char const *fstab = "/etc/fstab" ; PROG = "s6-mount" ; { int doall = 0 ; subgetopt_t l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "nz:arwt:o:", &l) ; if (opt == -1) break ; switch (opt) { case 'n' : break ; case 'z' : fstab = l.arg ; break ; case 'a' : doall = 1 ; break ; case 't' : fstype = l.arg ; break ; case 'w' : scanopt(&data, &flags, "rw") ; break ; case 'r' : scanopt(&data, &flags, "ro") ; break ; case 'o' : scanopt(&data, &flags, l.arg) ; break ; default : strerr_dieusage(100, USAGE) ; } } argc -= l.ind ; argv += l.ind ; if (doall) return mountall(fstab) ; } if (!argc) { int fd = open_readb("/proc/mounts") ; if (fd < 0) strerr_diefu2sys(111, "read ", "/proc/mounts") ; if (fd_cat(fd, 1) < 0) strerr_diefu2sys(111, "fd_cat ", "/proc/mounts") ; fd_close(fd) ; } else if (argc == 1) strerr_dieusage(100, USAGE) ; else if (!stralloc_0(&data)) strerr_diefu1sys(111, "build data string") ; else if (mount(argv[0], argv[1], fstype, flags, data.s) == -1) strerr_diefu4sys(errno == EBUSY ? 1 : 111, "mount ", argv[0], " on ", argv[1]) ; return 0 ; } s6-linux-utils-2.5.1.1/src/minutils/s6ps_pwcache.c0000644000000000000000000000323313066200153016550 0ustar /* ISC license. */ #include #include #include #include #include #include #include #include #include #include "s6-ps.h" static avltree pwcache_tree = AVLTREE_ZERO ; static genalloc pwcache_index = GENALLOC_ZERO ; int s6ps_pwcache_init (void) { avltree_init(&pwcache_tree, 5, 3, 8, &left_dtok, &uint32_cmp, &pwcache_index) ; return 1 ; } void s6ps_pwcache_finish (void) { avltree_free(&pwcache_tree) ; genalloc_free(dius_t, &pwcache_index) ; } int s6ps_pwcache_lookup (stralloc *sa, uid_t uid) { int wasnull = !satmp.s ; dius_t d = { .left = (uint32_t)uid, .right = satmp.len } ; uint32_t i ; if (!avltree_search(&pwcache_tree, &d.left, &i)) { struct passwd *pw ; unsigned int n = genalloc_len(dius_t, &pwcache_index) ; errno = 0 ; pw = getpwuid(uid) ; if (!pw) { if (errno) return 0 ; if (!stralloc_readyplus(&satmp, UINT_FMT + 2)) return 0 ; stralloc_catb(&satmp, "(", 1) ; satmp.len += uint_fmt(satmp.s + satmp.len, uid) ; stralloc_catb(&satmp, ")", 2) ; } else if (!stralloc_cats(&satmp, pw->pw_name) || !stralloc_0(&satmp)) return 0 ; if (!genalloc_append(dius_t, &pwcache_index, &d)) goto err ; if (!avltree_insert(&pwcache_tree, n)) { genalloc_setlen(dius_t, &pwcache_index, n) ; goto err ; } i = n ; } return stralloc_cats(sa, satmp.s + genalloc_s(dius_t, &pwcache_index)[i].right) ; err: { int e = errno ; if (wasnull) stralloc_free(&satmp) ; else satmp.len = d.right ; errno = e ; } return 0 ; } s6-linux-utils-2.5.1.1/src/minutils/s6ps_ttycache.c0000644000000000000000000000673613165473012016763 0ustar /* ISC license. */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include "s6-ps.h" static avltree ttycache_tree = AVLTREE_ZERO ; static genalloc ttycache_index = GENALLOC_ZERO ; int s6ps_ttycache_init (void) { avltree_init(&ttycache_tree, 5, 3, 8, &left_dtok, &uint32_cmp, &ttycache_index) ; return 1 ; } void s6ps_ttycache_finish (void) { avltree_free(&ttycache_tree) ; genalloc_free(dius_t, &ttycache_index) ; } static int check (char const *s, dev_t ttynr) { struct stat st ; if (stat(s, &st) < 0) return 0 ; return S_ISCHR(st.st_mode) && (st.st_rdev == ttynr) ; } /* No blind scanning of all /dev or /sys/devices, kthx */ static int ttyguess (stralloc *sa, dev_t ttynr) { unsigned int maj = major(ttynr), min = minor(ttynr) ; /* Try /dev/tty? and /dev/pts/? */ if (maj == 4 && min < 64) { char tmp[11] = "/dev/tty" ; tmp[uint_fmt(tmp+8, min)] = 0 ; if (check(tmp, ttynr)) return stralloc_cats(sa, tmp+5) && stralloc_0(sa) ; } else if (maj >= 136 && maj < 144) { unsigned int n = ((maj - 136) << 20) | min ; char tmp[9 + UINT_FMT] = "/dev/pts/" ; tmp[9 + uint_fmt(tmp+9, n)] = 0 ; if (check(tmp, ttynr)) return stralloc_cats(sa, tmp+5) && stralloc_0(sa) ; } /* Use /sys/dev/char/maj:min if it exists */ { int fd ; size_t pos = 14 ; char path[23 + 2 * UINT_FMT] = "/sys/dev/char/" ; pos += uint_fmt(path + pos, maj) ; path[pos++] = ':' ; pos += uint_fmt(path + pos, min) ; memcpy(path + pos, "/uevent", 8) ; fd = open_read(path) ; if (fd >= 0) { char buf[4097] ; buffer b = BUFFER_INIT(&fd_readv, fd, buf, 4097) ; size_t start = satmp.len ; int r ; for (;;) { satmp.len = start ; r = skagetln(&b, &satmp, '\n') ; if (r <= 0) break ; if ((satmp.len - start) > 8 && !memcmp(satmp.s + start, "DEVNAME=", 8)) break ; } fd_close(fd) ; if (r > 0) { satmp.s[satmp.len - 1] = 0 ; satmp.len = start ; memcpy(satmp.s + start + 3, "/dev/", 5) ; if (check(satmp.s + start + 3, ttynr)) return stralloc_cats(sa, satmp.s + start + 8) && stralloc_0(sa) ; } } } /* Fallback: print explicit maj:min */ { size_t pos = 1 ; char tmp[3 + 2 * UINT_FMT] = "(" ; pos += uint_fmt(tmp + pos, maj) ; tmp[pos++] = ':' ; pos += uint_fmt(tmp + pos, min) ; tmp[pos++] = ')' ; tmp[pos++] = 0 ; return stralloc_catb(sa, tmp, pos) ; } } int s6ps_ttycache_lookup (stralloc *sa, dev_t ttynr) { int wasnull = !satmp.s ; dius_t d = { .left = (uint32_t)ttynr, .right = satmp.len } ; uint32_t i ; if (!avltree_search(&ttycache_tree, &d.left, &i)) { unsigned int n = genalloc_len(dius_t, &ttycache_index) ; if (!ttyguess(&satmp, ttynr)) return 0 ; if (!genalloc_append(dius_t, &ttycache_index, &d)) goto err ; if (!avltree_insert(&ttycache_tree, n)) { genalloc_setlen(dius_t, &ttycache_index, n) ; goto err ; } i = n ; } return stralloc_cats(sa, satmp.s + genalloc_s(dius_t, &ttycache_index)[i].right) ; err: { int e = errno ; if (wasnull) stralloc_free(&satmp) ; else satmp.len = d.right ; errno = e ; } return 0 ; } s6-linux-utils-2.5.1.1/src/minutils/deps-exe/0000755000000000000000000000000013334634600015536 5ustar s6-linux-utils-2.5.1.1/src/minutils/deps-exe/s6-chroot0000644000000000000000000000001212407015265017276 0ustar -lskarnet s6-linux-utils-2.5.1.1/src/minutils/deps-exe/s6-logwatch0000644000000000000000000000001212407015265017610 0ustar -lskarnet s6-linux-utils-2.5.1.1/src/minutils/deps-exe/s6-pivotchroot0000644000000000000000000000001212407015265020360 0ustar -lskarnet s6-linux-utils-2.5.1.1/src/minutils/deps-exe/s6-mount0000644000000000000000000000001212407015265017142 0ustar -lskarnet s6-linux-utils-2.5.1.1/src/minutils/deps-exe/s6-swapon0000644000000000000000000000001212407015265017307 0ustar -lskarnet s6-linux-utils-2.5.1.1/src/minutils/deps-exe/s6-freeramdisk0000644000000000000000000000001212407015265020274 0ustar -lskarnet s6-linux-utils-2.5.1.1/src/minutils/deps-exe/s6-fillurandompool0000644000000000000000000000001212766502572021220 0ustar -lskarnet s6-linux-utils-2.5.1.1/src/minutils/deps-exe/s6-umount0000644000000000000000000000001212407015265017327 0ustar -lskarnet s6-linux-utils-2.5.1.1/src/minutils/deps-exe/s6-hostname0000644000000000000000000000001212407015265017616 0ustar -lskarnet s6-linux-utils-2.5.1.1/src/minutils/deps-exe/s6-swapoff0000644000000000000000000000001212407015265017445 0ustar -lskarnet s6-linux-utils-2.5.1.1/src/minutils/deps-exe/s6-ps0000644000000000000000000000022013330421020016405 0ustar s6ps_statparse.o s6ps_otree.o s6ps_pfield.o s6ps_pwcache.o s6ps_grcache.o s6ps_ttycache.o s6ps_wchan.o ${LIBNSSS} -lskarnet ${MAYBEPTHREAD_LIB} s6-linux-utils-2.5.1.1/src/minutils/s6-ps.c0000644000000000000000000002747513533714777015176 0ustar /* ISC license. */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "s6-ps.h" #define USAGE "s6-ps [ -H ] [ -w spacing ] [ -W wchanfile ] [ -l | -o field,field... ]" #define RIGHTFORMATTED ( \ (1 << PFIELD_PID) | \ (1 << PFIELD_PPID) | \ (1 << PFIELD_PGRP) | \ (1 << PFIELD_SESSION) | \ (1 << PFIELD_TPGID) | \ (1 << PFIELD_PRIO) | \ (1 << PFIELD_NICE) | \ (1 << PFIELD_THREADS) | \ (1 << PFIELD_VSIZE) | \ (1 << PFIELD_RSS) | \ (1 << PFIELD_RSSLIM) | \ (1 << PFIELD_CPUNO) | \ (1 << PFIELD_RTPRIO) | \ (1 << PFIELD_PMEM) | \ (1 << PFIELD_PCPU) | \ ((uint64)1 << PFIELD_CPCPU)) void *left_dtok (unsigned int d, void *x) { return (void *)&genalloc_s(dius_t, (genalloc *)x)[d].left ; } int uint32_cmp (void const *a, void const *b, void *x) { uint32_t aa = *(uint32_t *)a ; uint32_t bb = *(uint32_t *)b ; (void)x ; return (aa < bb) ? -1 : (aa > bb) ; } static void *pid_dtok (unsigned int d, void *x) { return &((pscan_t *)x)[d].pid ; } static int fillo_notree (unsigned int i, unsigned int h, void *x) { static unsigned int j = 0 ; unsigned int *list = x ; list[j++] = i ; (void)h ; return 1 ; } static inline unsigned int fieldscan (char const *s, pfield_t *list, uint64_t *fbf) { uint64_t bits = 0 ; unsigned int n = 0 ; int cont = 1 ; for (; cont ; n++) { size_t len = str_chr(s, ',') ; pfield_t i = 0 ; if (!len) strerr_dief3x(100, "invalid", " (empty)", " field for -o option") ; if (!s[len]) cont = 0 ; { char tmp[len+1] ; memcpy(tmp, s, len) ; tmp[len] = 0 ; for (; i < PFIELD_PHAIL ; i++) if (!strcmp(tmp, s6ps_opttable[i])) break ; if (i >= PFIELD_PHAIL) strerr_dief4x(100, "invalid", " field for -o option", ": ", tmp) ; if (bits & (1 << i)) strerr_dief4x(100, "duplicate", " field for -o option", ": ", tmp) ; } s += len + 1 ; list[n] = i ; bits |= (1 << i) ; } *fbf = bits ; return n ; } static int slurpit (unsigned int dirfd, stralloc *data, char const *buf, char const *what, size_t *len) { size_t start = data->len ; int fd = open_readat(dirfd, what) ; if (fd < 0) return 0 ; if (!slurp(data, fd)) strerr_diefu4sys(111, "slurp ", buf, "/", what) ; fd_close(fd) ; *len = data->len - start ; return 1 ; } int main (int argc, char const *const *argv) { genalloc pscans = GENALLOC_ZERO ; /* array of pscan_t */ pfield_t fieldlist[PFIELD_PHAIL] = { PFIELD_USER, PFIELD_PID, PFIELD_TTY, PFIELD_STATE, PFIELD_START, PFIELD_ARGS } ; uint64_t fbf = (1 << PFIELD_USER) | (1 << PFIELD_PID) | (1 << PFIELD_TTY) | (1 << PFIELD_STATE) | (1 << PFIELD_START) | (1 << PFIELD_ARGS) ; size_t mypos = 0 ; unsigned int nfields = 6 ; pscan_t *p ; size_t n ; unsigned int spacing = 2 ; int flagtree = 0 ; char const *wchanfile = 0 ; int needstat ; PROG = "s6-ps" ; { subgetopt_t l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "Hlw:W:o:", &l) ; if (opt == -1) break ; switch (opt) { case 'H' : flagtree = 1 ; break ; case 'l' : { nfields = 11 ; fbf = (1 << PFIELD_USER) | (1 << PFIELD_PID) | ((uint64)1 << PFIELD_CPCPU) | (1 << PFIELD_PMEM) | (1 << PFIELD_VSIZE) | (1 << PFIELD_RSS) | (1 << PFIELD_TTY) | (1 << PFIELD_STATE) | (1 << PFIELD_START) | (1 << PFIELD_CTTIME) | (1 << PFIELD_ARGS) ; fieldlist[0] = PFIELD_USER ; fieldlist[1] = PFIELD_PID ; fieldlist[2] = PFIELD_CPCPU ; fieldlist[3] = PFIELD_PMEM ; fieldlist[4] = PFIELD_VSIZE ; fieldlist[5] = PFIELD_RSS ; fieldlist[6] = PFIELD_TTY ; fieldlist[7] = PFIELD_STATE ; fieldlist[8] = PFIELD_START ; fieldlist[9] = PFIELD_CTTIME ; fieldlist[10] = PFIELD_ARGS ; break ; } case 'w' : { if (!uint0_scan(l.arg, &spacing)) strerr_dieusage(100, USAGE) ; break ; } case 'W' : wchanfile = l.arg ; break ; case 'o' : { nfields = fieldscan(l.arg, fieldlist, &fbf) ; break ; } default : strerr_dieusage(100, USAGE) ; } } argc -= l.ind ; argv += l.ind ; } if (!spacing) spacing = 1 ; if (spacing > 256) spacing = 256 ; needstat = flagtree || !!(fbf & ( (1 << PFIELD_PID) | (1 << PFIELD_COMM) | (1 << PFIELD_STATE) | (1 << PFIELD_PPID) | (1 << PFIELD_PGRP) | (1 << PFIELD_SESSION) | (1 << PFIELD_TTY) | (1 << PFIELD_TPGID) | (1 << PFIELD_UTIME) | (1 << PFIELD_STIME) | (1 << PFIELD_CUTIME) | (1 << PFIELD_CSTIME) | (1 << PFIELD_PRIO) | (1 << PFIELD_NICE) | (1 << PFIELD_THREADS) | (1 << PFIELD_START) | (1 << PFIELD_VSIZE) | (1 << PFIELD_RSS) | (1 << PFIELD_RSSLIM) | (1 << PFIELD_CPUNO) | (1 << PFIELD_RTPRIO) | (1 << PFIELD_RTPOLICY) | (1 << PFIELD_PMEM) | (1 << PFIELD_WCHAN) | (1 << PFIELD_PCPU) | (1 << PFIELD_TTIME) | (1 << PFIELD_CTTIME) | ((uint64)1 << PFIELD_TSTART) | ((uint64)1 << PFIELD_CPCPU))) ; /* Scan /proc */ { int needstatdir = !!(fbf & ((1 << PFIELD_USER) | (1 << PFIELD_GROUP))) ; pid_t mypid = getpid() ; DIR *dir = opendir("/proc") ; direntry *d ; char buf[25] = "/proc/" ; if (!dir) strerr_diefu1sys(111, "open /proc") ; for (;;) { pscan_t pscan = PSCAN_ZERO ; uint64_t u ; int dirfd ; errno = 0 ; d = readdir(dir) ; if (!d) break ; if (!uint640_scan(d->d_name, &u)) continue ; pscan.pid = u ; strcpy(buf+6, d->d_name) ; dirfd = open_read(buf) ; if (dirfd < 0) continue ; if (needstatdir) { struct stat st ; if (fstat(dirfd, &st) < 0) goto errindir ; pscan.uid = st.st_uid ; pscan.gid = st.st_gid ; } if (needstat) { if (!slurpit(dirfd, &pscan.data, buf, "stat", &pscan.statlen)) goto errindir ; if (!slurpit(dirfd, &pscan.data, buf, "comm", &pscan.commlen)) goto errindir ; if (pscan.commlen) { pscan.commlen-- ; pscan.data.len-- ; } } if (fbf & (1 << PFIELD_ARGS)) { if (!slurpit(dirfd, &pscan.data, buf, "cmdline", &pscan.cmdlen)) goto errindir ; while (!pscan.data.s[pscan.data.len-1]) { pscan.cmdlen-- ; pscan.data.len-- ; } } if (fbf & (1 << PFIELD_ENV)) slurpit(dirfd, &pscan.data, buf, "environ", &pscan.envlen) ; fd_close(dirfd) ; if (!genalloc_append(pscan_t, &pscans, &pscan)) strerr_diefu1sys(111, "genalloc_append") ; if (pscan.pid == mypid) mypos = genalloc_len(pscan_t, &pscans) ; continue ; errindir: fd_close(dirfd) ; stralloc_free(&pscan.data) ; } if (errno) strerr_diefu1sys(111, "readdir /proc") ; dir_close(dir) ; } /* Add a process 0 as a root and sentinel */ { pscan_t pscan = { .pid = 0, .ppid = 0 } ; if (!genalloc_append(pscan_t, &pscans, &pscan)) strerr_diefu1sys(111, "genalloc_append") ; } p = genalloc_s(pscan_t, &pscans) ; n = genalloc_len(pscan_t, &pscans) - 1 ; { unsigned int orderedlist[n+1] ; /* 1st element will be 0, ignored */ unsigned int i = 0 ; /* Order the processes for display */ { AVLTREEN_DECLARE_AND_INIT(pidtree, n+1, &pid_dtok, &uint32_cmp, p) ; for (i = 0 ; i < n ; i++) { if (needstat && !s6ps_statparse(p+i)) strerr_diefu1sys(111, "parse process stats") ; if (!avltreen_insert(&pidtree, i)) strerr_diefu1sys(111, "avltreen_insert") ; } if (!avltreen_insert(&pidtree, n)) strerr_diefu1sys(111, "avltreen_insert") ; if (flagtree) s6ps_otree(p, n+1, &pidtree, orderedlist) ; else avltreen_iter_nocancel(&pidtree, avltreen_totalsize(&pidtree), &fillo_notree, orderedlist) ; } /* Format, compute length, output */ if (fbf & ((1 << PFIELD_START) | ((uint64)1 << PFIELD_TSTART) | (1 << PFIELD_PCPU) | ((uint64)1 << PFIELD_CPCPU))) { tain_wallclock_read_g() ; s6ps_compute_boottime(p, mypos) ; } if (fbf & (1 << PFIELD_USER) && !s6ps_pwcache_init()) strerr_diefu1sys(111, "init user name cache") ; if (fbf & (1 << PFIELD_GROUP) && !s6ps_grcache_init()) strerr_diefu1sys(111, "init group name cache") ; if (fbf & (1 << PFIELD_TTY) && !s6ps_ttycache_init()) strerr_diefu1sys(111, "init tty name cache") ; if (fbf & (1 << PFIELD_WCHAN) && !s6ps_wchan_init(wchanfile)) { if (wchanfile) strerr_warnwu2sys("init wchan file ", wchanfile) ; else strerr_warnwu1sys("init wchan") ; } { size_t fmtpos[n][nfields] ; size_t fmtlen[n][nfields] ; size_t maxlen[nfields] ; unsigned int maxspaces = 0 ; for (i = 0 ; i < nfields ; i++) maxlen[i] = strlen(s6ps_fieldheaders[fieldlist[i]]) ; for (i = 0 ; i < n ; i++) { unsigned int j = 0 ; for (; j < nfields ; j++) { if (!(*s6ps_pfield_fmt[fieldlist[j]])(p+i, &fmtpos[i][j], &fmtlen[i][j])) strerr_diefu1sys(111, "format fields") ; if (fmtlen[i][j] > maxlen[j]) maxlen[j] = fmtlen[i][j] ; } } for (i = 0 ; i < nfields ; i++) if (maxlen[i] > maxspaces) maxspaces = maxlen[i] ; maxspaces += spacing ; if (fbf & (1 << PFIELD_USER)) s6ps_pwcache_finish() ; if (fbf & (1 << PFIELD_GROUP)) s6ps_grcache_finish() ; if (fbf & (1 << PFIELD_TTY)) s6ps_ttycache_finish() ; if (fbf & (1 << PFIELD_WCHAN)) s6ps_wchan_finish() ; stralloc_free(&satmp) ; { char spaces[maxspaces] ; for (i = 0 ; i < maxspaces ; i++) spaces[i] = ' ' ; for (i = 0 ; i < nfields ; i++) { unsigned int rightformatted = !!(((uint64_t)1 << fieldlist[i]) & RIGHTFORMATTED) ; size_t len = strlen(s6ps_fieldheaders[fieldlist[i]]) ; if (rightformatted && (buffer_put(buffer_1, spaces, maxlen[i] - len) < (ssize_t)(maxlen[i] - len))) goto nowrite ; if (buffer_put(buffer_1, s6ps_fieldheaders[fieldlist[i]], len) < (ssize_t)len) goto nowrite ; if ((i < nfields-1) && (buffer_put(buffer_1, spaces, !rightformatted * (maxlen[i] - len) + spacing) < (ssize_t)(!rightformatted * (maxlen[i] - len) + spacing))) goto nowrite ; } if (buffer_put(buffer_1, "\n", 1) < 1) goto nowrite ; for (i = 0 ; i < n ; i++) { unsigned int oi = orderedlist[i+1] ; unsigned int j = 0 ; for (; j < nfields ; j++) { unsigned int rightformatted = !!(((uint64_t)1 << fieldlist[j]) & RIGHTFORMATTED) ; if (rightformatted && (buffer_put(buffer_1, spaces, maxlen[j] - fmtlen[oi][j]) < (ssize_t)(maxlen[j] - fmtlen[oi][j]))) goto nowrite ; if (buffer_put(buffer_1, p[oi].data.s + fmtpos[oi][j], fmtlen[oi][j]) < (ssize_t)fmtlen[oi][j]) goto nowrite ; if ((j < nfields-1) && (buffer_put(buffer_1, spaces, !rightformatted * (maxlen[j] - fmtlen[oi][j]) + spacing) < (ssize_t)(!rightformatted * (maxlen[j] - fmtlen[oi][j]) + spacing))) goto nowrite ; } if (buffer_put(buffer_1, "\n", 1) < 1) goto nowrite ; } } } } buffer_flush(buffer_1) ; return 0 ; nowrite: strerr_diefu1sys(111, "write to stdout") ; } s6-linux-utils-2.5.1.1/src/minutils/s6-pivotchroot.c0000644000000000000000000000124713147051250017076 0ustar /* ISC license. */ #ifndef _BSD_SOURCE #define _BSD_SOURCE #endif #include #include #include #define USAGE "s6-pivotchroot old-place-for-new-root new-place-for-old-root prog..." extern int pivot_root (char const *, char const *) ; int main (int argc, char const *const *argv, char const *const *envp) { PROG = "s6-pivotchroot" ; if (argc < 4) strerr_dieusage(100, USAGE) ; if (chdir(argv[1]) < 0) strerr_diefu2sys(111, "chdir to ", argv[1]) ; if (pivot_root(".", argv[2]) < 0) strerr_diefu1sys(111, "pivot_root") ; if (chroot(".") < 0) strerr_diefu1sys(111, "chroot") ; xpathexec_run(argv[3], argv+3, envp) ; } s6-linux-utils-2.5.1.1/src/minutils/s6-swapoff.c0000644000000000000000000000261213061734243016165 0ustar /* ISC license. */ #include #include #include #include #include #include #include #include #include #include #define USAGE "s6-swapoff device s6-swapoff -a" #define BUFSIZE 4095 static int swapoffall ( ) { char buf[BUFSIZE+1] ; buffer b ; stralloc sa = STRALLOC_ZERO ; int e = 0 ; int r ; int fd = open_readb("/proc/swaps") ; if (fd < 0) strerr_diefu1sys(111, "open_readb /proc/swaps") ; buffer_init(&b, &buffer_read, fd, buf, BUFSIZE+1) ; if (skagetln(&b, &sa, '\n') < 0) strerr_diefu1sys(111, "skagetln") ; for (;;) { size_t n ; sa.len = 0 ; r = skagetln(&b, &sa, '\n') ; if (r < 0) strerr_diefu1sys(111, "skagetln") ; if (!r) break ; n = byte_chr(sa.s, sa.len, ' ') ; if (n >= sa.len) strerr_dief1x(111, "invalid line in /proc/swaps") ; sa.s[n] = 0 ; if (swapoff(sa.s) < 0) { e++ ; strerr_warnwu2sys("swapoff ", sa.s) ; } } fd_close(fd) ; stralloc_free(&sa) ; return e ; } int main (int argc, char const *const *argv) { PROG = "s6-swapoff" ; if (argc < 2) strerr_dieusage(100, USAGE) ; if ((argv[1][0] == '-') && (argv[1][1] == 'a') && !argv[1][2]) return swapoffall() ; if (swapoff(argv[1]) == -1) strerr_diefu2sys(111, "swapoff ", argv[1]) ; return 0 ; } s6-linux-utils-2.5.1.1/src/minutils/s6ps_wchan.c0000644000000000000000000000452213061734243016247 0ustar /* ISC license. */ #include #include #include #include #include #include #include "s6-ps.h" static stralloc sysmap = STRALLOC_ZERO ; static genalloc ind = GENALLOC_ZERO ; int s6ps_wchan_init (char const *file) { if (file) { if (!openslurpclose(&sysmap, file)) return 0 ; } else { char *files[3] = { "/proc/kallsyms", 0, "/boot/System.map" } ; struct utsname uts ; size_t n ; if (uname(&uts) < 0) return 0 ; n = strlen(uts.release) ; { char buf[18 + n] ; unsigned int i = 0 ; memcpy(buf, "/boot/System.map", 16) ; buf[16] = '-' ; memcpy(buf + 17, uts.release, n + 1) ; files[1] = buf ; for (; i < 3 ; i++) if (openslurpclose(&sysmap, files[i])) break ; if (i >= 3) return 0 ; } } { size_t i = 0 ; if (!genalloc_append(size_t, &ind, &i)) goto err2 ; for (i = 1 ; i <= sysmap.len ; i++) if (sysmap.s[i-1] == '\n') if (!genalloc_append(size_t, &ind, &i)) goto err ; } return 1 ; err: genalloc_free(size_t, &ind) ; err2: stralloc_free(&sysmap) ; return 0 ; } void s6ps_wchan_finish (void) { genalloc_free(size_t, &ind) ; stralloc_free(&sysmap) ; } static inline size_t lookup (uint64_t addr, size_t *i) { size_t low = 0, mid, high = genalloc_len(size_t, &ind), len ; for (;;) { uint64_t cur ; mid = (low + high) >> 1 ; len = uint64_xscan(sysmap.s + genalloc_s(size_t, &ind)[mid], &cur) ; if (!len) return 0 ; if (cur == addr) break ; if (mid == low) return 0 ; if (addr < cur) high = mid ; else low = mid ; } *i = mid ; return len ; } int s6ps_wchan_lookup (stralloc *sa, uint64_t addr) { if (addr == (sizeof(void *) == 8 ? 0xffffffffffffffffULL : 0xffffffffUL)) return stralloc_catb(sa, "*", 1) ; if (!addr) return stralloc_catb(sa, "-", 1) ; if (sysmap.len) { size_t i, pos, len = lookup(addr, &i) ; if (!len) return stralloc_catb(sa, "?", 1) ; pos = genalloc_s(size_t, &ind)[i] + len + 3 ; return stralloc_catb(sa, sysmap.s + pos, genalloc_s(size_t, &ind)[i+1] - 1 - pos) ; } if (!stralloc_readyplus(sa, UINT64_FMT + 3)) return 0 ; stralloc_catb(sa, "(0x", 3) ; sa->len += uint64_fmt(sa->s + sa->len, addr) ; stralloc_catb(sa, ")", 1) ; return 1 ; } s6-linux-utils-2.5.1.1/src/minutils/s6ps_pfield.c0000644000000000000000000003147713073426535016430 0ustar /* ISC license. */ #include #include #include #include #include #include #include #include #include #include #include #include "s6-ps.h" static char const *const fieldheaders[PFIELD_PHAIL] = { "PID", "COMM", "STAT", "PPID", "PGRP", "SESSION", "TTY", "TPGID", "UTIME", "STIME", "CUTIME", "CSTIME", "PRIO", "NICE", "THREADS", "START", "VSZ", "RSS", "RSSLIM", "CPU", "RTPRIO", "RTPOLICY", "USER", "GROUP", "%MEM", "WCHAN", "COMMAND", "ENVIRONMENT", "%CPU", "TTIME", "CTTIME", "TSTART", "C%CPU" } ; char const *const *s6ps_fieldheaders = fieldheaders ; static char const *const opttable[PFIELD_PHAIL] = { "pid", "comm", "s", "ppid", "pgrp", "sess", "tty", "tpgid", "utime", "stime", "cutime", "cstime", "prio", "nice", "thcount", "start", "vsize", "rss", "rsslimit", "psr", "rtprio", "policy", "user", "group", "pmem", "wchan", "args", "env", "pcpu", "ttime", "cttime", "tstart", "cpcpu" } ; char const *const *s6ps_opttable = opttable ; static tain_t boottime = TAIN_EPOCH ; static int fmt_64 (pscan_t *p, size_t *pos, size_t *len, uint64_t u) { if (!stralloc_readyplus(&p->data, UINT64_FMT)) return 0 ; *pos = p->data.len ; *len = uint64_fmt(p->data.s + *pos, u) ; p->data.len += *len ; return 1 ; } static int fmt_i (pscan_t *p, size_t *pos, size_t *len, int d) { if (!stralloc_readyplus(&p->data, UINT32_FMT+1)) return 0 ; *pos = p->data.len ; *len = int_fmt(p->data.s + *pos, d) ; p->data.len += *len ; return 1 ; } static int fmt_pid (pscan_t *p, size_t *pos, size_t *len) { return fmt_64(p, pos, len, p->pid) ; } static int fmt_comm (pscan_t *p, size_t *pos, size_t *len) { *pos = p->statlen ; *len = p->commlen ; return 1 ; } static int fmt_s (pscan_t *p, size_t *pos, size_t *len) { if (!stralloc_readyplus(&p->data, 4)) return 0 ; *pos = p->data.len ; p->data.s[p->data.len++] = p->data.s[p->state] ; if (p->pid == p->session) p->data.s[p->data.len++] = 's' ; if (p->threads > 1) p->data.s[p->data.len++] = 'l' ; if ((p->tpgid > 0) && ((unsigned int)p->tpgid == p->pgrp)) p->data.s[p->data.len++] = '+' ; if (p->nice) p->data.s[p->data.len++] = (p->nice < 0) ? '<' : 'N' ; *len = p->data.len - *pos ; return 1 ; } static int fmt_ppid (pscan_t *p, size_t *pos, size_t *len) { return fmt_64(p, pos, len, p->ppid) ; } static int fmt_pgrp (pscan_t *p, size_t *pos, size_t *len) { return fmt_64(p, pos, len, p->pgrp) ; } static int fmt_session (pscan_t *p, size_t *pos, size_t *len) { return fmt_64(p, pos, len, p->session) ; } static int fmt_ttynr(pscan_t *p, size_t *pos, size_t *len) { if (p->ttynr) { size_t tmppos = p->data.len ; if (!s6ps_ttycache_lookup(&p->data, p->ttynr)) return 0 ; *pos = tmppos ; *len = p->data.len - tmppos ; } else { if (!stralloc_catb(&p->data, "-", 1)) return 0 ; *pos = p->data.len - 1 ; *len = 1 ; } return 1 ; } static int fmt_tpgid (pscan_t *p, size_t *pos, size_t *len) { return p->tpgid < 0 ? fmt_i(p, pos, len, -1) : fmt_64(p, pos, len, p->tpgid) ; } static unsigned int gethz (void) { static unsigned int hz = 0 ; if (!hz) { long jiffies = sysconf(_SC_CLK_TCK) ; if (jiffies < 1) { char fmt[ULONG_FMT + 1] ; fmt[long_fmt(fmt, jiffies)] = 0 ; strerr_warnw3x("invalid _SC_CLK_TCK value (", fmt, "), using 100") ; hz = 100 ; } else hz = (unsigned int)jiffies ; } return hz ; } int s6ps_compute_boottime (pscan_t *p, unsigned int mypos) { if (!mypos--) { strerr_warnwu1x("compute boot time - using epoch") ; return 0 ; } else { unsigned int hz = gethz() ; tain_t offset = { .sec = { .x = p[mypos].start / hz }, .nano = (p[mypos].start % hz) * (1000000000 / hz) } ; tain_sub(&boottime, &STAMP, &offset) ; return 1 ; } } static int fmt_jiffies (pscan_t *p, size_t *pos, size_t *len, uint64_t j) { unsigned int hz = gethz() ; uint32_t hrs, mins, secs, hfrac ; if (!stralloc_readyplus(&p->data, UINT64_FMT + 13)) return 0 ; hfrac = (j % hz) * 100 / hz ; *pos = p->data.len ; j /= hz ; secs = j % 60 ; j /= 60 ; mins = j % 60 ; j /= 60 ; hrs = j % 24 ; j /= 24 ; if (j) { p->data.len += uint64_fmt(p->data.s + p->data.len, j) ; p->data.s[p->data.len++] = 'd' ; } if (j || hrs) { uint320_fmt(p->data.s + p->data.len, hrs, 2) ; p->data.len += 2 ; p->data.s[p->data.len++] = 'h' ; } if (j || hrs || mins) { uint320_fmt(p->data.s + p->data.len, mins, 2) ; p->data.len += 2 ; p->data.s[p->data.len++] = 'm' ; } uint320_fmt(p->data.s + p->data.len, secs, 2) ; p->data.len += 2 ; if (!j && !hrs && !mins) { p->data.s[p->data.len++] = '.' ; uint320_fmt(p->data.s + p->data.len, hfrac, 2) ; p->data.len += 2 ; } p->data.s[p->data.len++] = 's' ; *len = p->data.len - *pos ; return 1 ; } static int fmt_utime (pscan_t *p, size_t *pos, size_t *len) { return fmt_jiffies(p, pos, len, p->utime) ; } static int fmt_stime (pscan_t *p, size_t *pos, size_t *len) { return fmt_jiffies(p, pos, len, p->stime) ; } static int fmt_cutime (pscan_t *p, size_t *pos, size_t *len) { return fmt_jiffies(p, pos, len, p->utime + p->cutime) ; } static int fmt_cstime (pscan_t *p, size_t *pos, size_t *len) { return fmt_jiffies(p, pos, len, p->stime + p->cstime) ; } static int fmt_prio (pscan_t *p, size_t *pos, size_t *len) { return fmt_i(p, pos, len, p->prio) ; } static int fmt_nice (pscan_t *p, size_t *pos, size_t *len) { return fmt_i(p, pos, len, p->nice) ; } static int fmt_threads (pscan_t *p, size_t *pos, size_t *len) { return fmt_64(p, pos, len, p->threads) ; } static int fmt_timedate (pscan_t *p, size_t *pos, size_t *len, struct tm const *tm) { static struct tm nowtm = { .tm_year = 0 } ; size_t tmplen ; char *tmpstrf = "%F" ; if (!nowtm.tm_year && !localtm_from_tai(&nowtm, tain_secp(&STAMP), 1)) return 0 ; if (!stralloc_readyplus(&p->data, 20)) return 0 ; if (tm->tm_year == nowtm.tm_year && tm->tm_yday == nowtm.tm_yday) tmpstrf = "%T" ; else if (tm->tm_year == nowtm.tm_year || (tm->tm_year+1 == nowtm.tm_year && (nowtm.tm_mon + 12 - tm->tm_mon) % 12 < 9)) tmpstrf = "%b%d %R" ; tmplen = strftime(p->data.s + p->data.len, 20, tmpstrf, tm) ; if (!tmplen) return 0 ; *len = tmplen ; *pos = p->data.len ; p->data.len += tmplen ; return 1 ; } static int fmt_start (pscan_t *p, size_t *pos, size_t *len) { struct tm starttm ; unsigned int hz = gethz() ; tain_t blah = { .sec = { .x = p->start / hz }, .nano = (p->start % hz) * (1000000000 / hz) } ; tain_add(&blah, &boottime, &blah) ; if (!localtm_from_tai(&starttm, tain_secp(&blah), 1)) return 0 ; return fmt_timedate(p, pos, len, &starttm) ; } static unsigned int getpgsz (void) { static unsigned int pgsz = 0 ; if (!pgsz) { long sz = sysconf(_SC_PAGESIZE) ; if (sz < 1) { char fmt[ULONG_FMT + 1] ; fmt[long_fmt(fmt, sz)] = 0 ; strerr_warnw3x("invalid _SC_PAGESIZE value (", fmt, "), using 4096") ; pgsz = 4096 ; } else pgsz = sz ; } return pgsz ; } static int fmt_vsize (pscan_t *p, size_t *pos, size_t *len) { return fmt_64(p, pos, len, p->vsize / 1024) ; } static int fmt_rss (pscan_t *p, size_t *pos, size_t *len) { return fmt_64(p, pos, len, p->rss * (getpgsz() / 1024)) ; } static int fmt_rsslim (pscan_t *p, size_t *pos, size_t *len) { return fmt_64(p, pos, len, p->rsslim / 1024) ; } static int fmt_cpuno (pscan_t *p, size_t *pos, size_t *len) { return fmt_64(p, pos, len, p->cpuno) ; } static int fmt_rtprio (pscan_t *p, size_t *pos, size_t *len) { return fmt_64(p, pos, len, p->rtprio) ; } static int fmt_policy (pscan_t *p, size_t *pos, size_t *len) { static char const *const policies[8] = { "NORMAL", "FIFO", "RR", "BATCH", "ISO", "IDLE", "UNKNOWN", "UNKNOWN" } ; size_t tmppos = p->data.len ; if (!stralloc_cats(&p->data, policies[p->policy & 7])) return 0 ; *pos = tmppos ; *len = p->data.len - tmppos ; return 1 ; } static int fmt_user (pscan_t *p, size_t *pos, size_t *len) { size_t tmppos = p->data.len ; if (!s6ps_pwcache_lookup(&p->data, p->uid)) return 0 ; *pos = tmppos ; *len = p->data.len - tmppos ; return 1 ; } static int fmt_group (pscan_t *p, size_t *pos, size_t *len) { size_t tmppos = p->data.len ; if (!s6ps_grcache_lookup(&p->data, p->gid)) return 0 ; *pos = tmppos ; *len = p->data.len - tmppos ; return 1 ; } static struct sysinfo si = { .totalram = 0, .loads = { 0, 0, 0 } } ; static uint64_t gettotalmem (void) { uint64_t totalmem = 0 ; if (!si.totalram && (sysinfo(&si) < 0)) return 0 ; totalmem = si.totalram ; totalmem *= si.mem_unit ; return totalmem ; } static int percent (stralloc *sa, unsigned int n, size_t *pos, size_t *len) { if (!stralloc_readyplus(sa, UINT64_FMT+1)) return 0 ; *pos = sa->len ; sa->len += uint_fmt(sa->s + sa->len, n / 100) ; sa->s[sa->len++] = '.' ; uint0_fmt(sa->s + sa->len, n % 100, 2) ; sa->len += 2 ; *len = sa->len - *pos ; return 1 ; } static int fmt_pmem (pscan_t *p, size_t *pos, size_t *len) { uint64 l = gettotalmem() ; return l ? percent(&p->data, p->rss * getpgsz() * 10000 / l, pos, len) : 0 ; } static int fmt_wchan (pscan_t *p, size_t *pos, size_t *len) { size_t tmppos = p->data.len ; if (!s6ps_wchan_lookup(&p->data, p->wchan)) return 0 ; *len = p->data.len - tmppos ; *pos = tmppos ; return 1 ; } static int fmt_args (pscan_t *p, size_t *pos, size_t *len) { if (!stralloc_readyplus(&p->data, (p->height << 2) + (p->cmdlen ? p->cmdlen : p->commlen + (p->data.s[p->state] == 'Z' ? 11 : 3)))) return 0 ; *pos = p->data.len ; if (p->height) { unsigned int i = 0 ; for (; i < 4 * (unsigned int)p->height - 3 ; i++) p->data.s[p->data.len + i] = ' ' ; memcpy(p->data.s + p->data.len + 4 * p->height - 3, "\\_ ", 3) ; p->data.len += p->height << 2 ; } if (p->cmdlen) { char const *r = p->data.s + p->statlen + p->commlen ; char *w = p->data.s + p->data.len ; size_t i = p->cmdlen ; while (i--) { char c = *r++ ; *w++ = c ? c : ' ' ; } p->data.len += p->cmdlen ; } else if (p->data.s[p->state] == 'Z') { stralloc_catb(&p->data, p->data.s + uint32_fmt(0, p->pid) + 2, p->commlen) ; stralloc_catb(&p->data, " ", 10) ; } else stralloc_catb(&p->data, p->data.s + uint32_fmt(0, p->pid) + 1, p->commlen+2) ; *len = p->data.len - *pos ; return 1 ; } static int fmt_env (pscan_t *p, size_t *pos, size_t *len) { size_t i = 0 ; if (!p->envlen) { if (!stralloc_catb(&p->data, "*", 1)) return 0 ; *pos = p->data.len - 1 ; *len = 1 ; return 1 ; } *pos = p->statlen + p->commlen + p->cmdlen ; *len = p->envlen ; for (; i < *len ; i++) if (!p->data.s[*pos + i]) p->data.s[*pos + i] = ' ' ; return 1 ; } static uint64_t gettotalj (uint64_t j) { tain_t totaltime ; unsigned int hz = gethz() ; tain_sub(&totaltime, &STAMP, &boottime) ; j = totaltime.sec.x * hz + totaltime.nano / (1000000000 / hz) - j ; if (!j) j = 1 ; return j ; } static int fmt_pcpu (pscan_t *p, size_t *pos, size_t *len) { return percent(&p->data, 10000 * (p->utime + p->stime) / gettotalj(p->start), pos, len) ; } static int fmt_ttime (pscan_t *p, size_t *pos, size_t *len) { return fmt_jiffies(p, pos, len, p->utime + p->stime) ; } static int fmt_cttime (pscan_t *p, size_t *pos, size_t *len) { return fmt_jiffies(p, pos, len, p->utime + p->stime + p->cutime + p->cstime) ; } static int fmt_tstart (pscan_t *p, size_t *pos, size_t *len) { unsigned int hz = gethz() ; tain_t blah = { .sec = { .x = p->start / hz }, .nano = (p->start % hz) * (1000000000 / hz) } ; if (!stralloc_readyplus(&p->data, TIMESTAMP)) return 0 ; tain_add(&blah, &boottime, &blah) ; *pos = p->data.len ; *len = timestamp_fmt(p->data.s + p->data.len, &blah) ; p->data.len += *len ; return 1 ; } static int fmt_cpcpu (pscan_t *p, size_t *pos, size_t *len) { return percent(&p->data, 10000 * (p->utime + p->stime + p->cutime + p->cstime) / gettotalj(p->start), pos, len) ; } static pfieldfmt_func_t_ref pfieldfmt_table[PFIELD_PHAIL] = { &fmt_pid, &fmt_comm, &fmt_s, &fmt_ppid, &fmt_pgrp, &fmt_session, &fmt_ttynr, &fmt_tpgid, &fmt_utime, &fmt_stime, &fmt_cutime, &fmt_cstime, &fmt_prio, &fmt_nice, &fmt_threads, &fmt_start, &fmt_vsize, &fmt_rss, &fmt_rsslim, &fmt_cpuno, &fmt_rtprio, &fmt_policy, &fmt_user, &fmt_group, &fmt_pmem, &fmt_wchan, &fmt_args, &fmt_env, &fmt_pcpu, &fmt_ttime, &fmt_cttime, &fmt_tstart, &fmt_cpcpu } ; pfieldfmt_func_t_ref *s6ps_pfield_fmt = pfieldfmt_table ; s6-linux-utils-2.5.1.1/src/minutils/s6-swapon.c0000644000000000000000000000157213061734243016033 0ustar /* ISC license. */ #include #include #include #include #include #include #define USAGE "s6-swapon device s6-swapon -a" static int swaponall () { struct mntent *d ; int e = 0 ; FILE *yuck = setmntent("/etc/fstab", "r") ; if (!yuck) strerr_diefu1sys(111, "setmntent /etc/fstab") ; while ((d = getmntent(yuck))) if (!strcmp(d->mnt_type, "swap") && (swapon(d->mnt_fsname, 0) == -1)) { e++ ; strerr_warnwu2sys("swapon ", d->mnt_fsname) ; } endmntent(yuck) ; return e ; } int main (int argc, char const *const *argv) { PROG = "s6-swapon" ; if (argc < 2) strerr_dieusage(100, USAGE) ; if ((argv[1][0] == '-') && (argv[1][1] == 'a') && !argv[1][2]) return swaponall() ; if (swapon(argv[1], 0) == -1) strerr_diefu2sys(111, "swapon ", argv[1]) ; return 0 ; } s6-linux-utils-2.5.1.1/src/minutils/mount-constants.h0000644000000000000000000000414212104567622017355 0ustar /* ISC license. */ #ifndef MOUNT_CONSTANTS_H #define MOUNT_CONSTANTS_H /* taken from util-linux-ng */ #ifndef MS_RDONLY #define MS_RDONLY 1 /* Mount read-only */ #endif #ifndef MS_NOSUID #define MS_NOSUID 2 /* Ignore suid and sgid bits */ #endif #ifndef MS_NODEV #define MS_NODEV 4 /* Disallow access to device special files */ #endif #ifndef MS_NOEXEC #define MS_NOEXEC 8 /* Disallow program execution */ #endif #ifndef MS_SYNCHRONOUS #define MS_SYNCHRONOUS 16 /* Writes are synced at once */ #endif #ifndef MS_REMOUNT #define MS_REMOUNT 32 /* Alter flags of a mounted FS */ #endif #ifndef MS_MANDLOCK #define MS_MANDLOCK 64 /* Allow mandatory locks on an FS */ #endif #ifndef MS_DIRSYNC #define MS_DIRSYNC 128 /* Directory modifications are synchronous */ #endif #ifndef MS_NOATIME #define MS_NOATIME 0x400 /* 1024: Do not update access times. */ #endif #ifndef MS_NODIRATIME #define MS_NODIRATIME 0x800 /* 2048: Don't update directory access times */ #endif #ifndef MS_BIND #define MS_BIND 0x1000 /* 4096: Mount existing tree also elsewhere */ #endif #ifndef MS_MOVE #define MS_MOVE 0x2000 /* 8192: Atomically move tree */ #endif #ifndef MS_REC #define MS_REC 0x4000 /* 16384: Recursive loopback */ #endif #ifndef MS_VERBOSE #define MS_VERBOSE 0x8000 /* 32768 */ #endif #ifndef MS_RELATIME #define MS_RELATIME 0x200000 /* 200000: Update access times relative to mtime/ctime */ #endif #ifndef MS_UNBINDABLE #define MS_UNBINDABLE (1<<17) /* 131072 unbindable */ #endif #ifndef MS_PRIVATE #define MS_PRIVATE (1<<18) /* 262144 Private */ #endif #ifndef MS_SLAVE #define MS_SLAVE (1<<19) /* 524288 Slave */ #endif #ifndef MS_SHARED #define MS_SHARED (1<<20) /* 1048576 Shared */ #endif #ifndef MS_I_VERSION #define MS_I_VERSION (1<<23) /* update inode I_version field */ #endif #ifndef MS_STRICTATIME #define MS_STRICTATIME (1<<24) /* strict atime semantics */ #endif /* * Magic mount flag number. Had to be or-ed to the flag values. */ #ifndef MS_MGC_VAL #define MS_MGC_VAL 0xC0ED0000 /* magic flag number to indicate "new" flags */ #endif #ifndef MS_MGC_MSK #define MS_MGC_MSK 0xffff0000 /* magic flag number mask */ #endif #endif s6-linux-utils-2.5.1.1/src/minutils/s6-chroot.c0000644000000000000000000000100413147051305016004 0ustar /* ISC license. */ #ifndef _BSD_SOURCE #define _BSD_SOURCE #endif #include #include #include #define USAGE "s6-chroot dir prog..." int main (int argc, char const *const *argv, char const *const *envp) { PROG = "s6-chroot" ; if (argc < 3) strerr_dieusage(100, USAGE) ; if (chdir(argv[1]) == -1) strerr_diefu2sys(111, "chdir to ", argv[1]) ; if (chroot(".") == -1) strerr_diefu2sys(111, "chroot in ", argv[1]) ; xpathexec_run(argv[2], argv+2, envp) ; } s6-linux-utils-2.5.1.1/src/minutils/s6-fillurandompool.c0000644000000000000000000000040413000212451017704 0ustar /* ISC license. */ #include #include int main (void) { char c ; PROG = "s6-fillurandompool" ; if (!random_init()) strerr_diefu1sys(111, "initialize random generator") ; random_string(&c, 1) ; return 0 ; } s6-linux-utils-2.5.1.1/src/minutils/s6-umount.c0000644000000000000000000000346413061734243016055 0ustar /* ISC license. */ #include #include #include #include #include #include #include #include #define USAGE "s6-umount mountpoint s6-umount -a" #define BUFSIZE 4096 #define MAXLINES 512 static int umountall ( ) { stralloc mountpoints[MAXLINES] ; char buf[BUFSIZE+1] ; buffer b ; stralloc sa = STRALLOC_ZERO ; unsigned int line = 0 ; int e = 0 ; int r ; int fd = open_readb("/proc/mounts") ; if (fd < 0) strerr_diefu1sys(111, "open /proc/mounts") ; memset(mountpoints, 0, sizeof(mountpoints)) ; buffer_init(&b, &buffer_read, fd, buf, BUFSIZE+1) ; for (;;) { size_t n, p ; if (line >= MAXLINES) strerr_dief1x(111, "/proc/mounts too big") ; sa.len = 0 ; r = skagetln(&b, &sa, '\n') ; if (r <= 0) break ; p = byte_chr(sa.s, sa.len, ' ') ; if (p >= sa.len) strerr_dief1x(111, "bad /proc/mounts format") ; p++ ; n = byte_chr(sa.s + p, sa.len - p, ' ') ; if (n == sa.len - p) strerr_dief1x(111, "bad /proc/mounts format") ; if (!stralloc_catb(&mountpoints[line], sa.s + p, n) || !stralloc_0(&mountpoints[line])) strerr_diefu1sys(111, "store mount point") ; line++ ; } fd_close(fd) ; stralloc_free(&sa) ; if (r < 0) strerr_diefu1sys(111, "read /proc/mounts") ; while (line--) if (umount(mountpoints[line].s) == -1) { e++ ; strerr_warnwu2sys("umount ", mountpoints[line].s) ; } return e ; } int main (int argc, char const *const *argv) { PROG = "s6-umount" ; if (argc < 2) strerr_dieusage(100, USAGE) ; if ((argv[1][0] == '-') && (argv[1][1] == 'a') && !argv[1][2]) return umountall() ; if (umount(argv[1]) == -1) strerr_diefu2sys(111, "umount ", argv[1]) ; return 0 ; } s6-linux-utils-2.5.1.1/src/minutils/deps-lib/0000755000000000000000000000000012407015423015517 5ustar s6-linux-utils-2.5.1.1/src/minutils/s6-logwatch.c0000644000000000000000000001102713227566032016333 0ustar /* ISC license. */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #define USAGE "s6-logwatch [ logdir ]" #define dieusage() strerr_dieusage(100, USAGE) #define B_READING 0 #define B_BLOCKING 1 #define B_WAITING 2 static unsigned int state ; static int fd ; static int newcurrent = 0 ; union inotify_event_u { struct inotify_event event ; char buf[sizeof(struct inotify_event) + NAME_MAX + 1] ; } ; static void goteof (void) { if (newcurrent) { fd_close(fd) ; fd = open_read("current") ; if (fd < 0) strerr_diefu1sys(111, "current") ; newcurrent = 0 ; state = B_READING ; } else state = B_BLOCKING ; } static int readit (int fd) { struct iovec v[2] ; ssize_t r ; buffer_wpeek(buffer_1, v) ; r = fd_readv(fd, v, 2) ; switch (r) { case -1 : return 0 ; case 0 : goteof() ; break ; default : buffer_wseek(buffer_1, r) ; } return 1 ; } static void maketransition (unsigned int transition) { static unsigned char const table[3][3] = { { 0x10, 0x00, 0x00 }, { 0x60, 0x22, 0x00 }, { 0x40, 0x03, 0x02 } } ; unsigned char c = table[state][transition] ; state = c & 0x0f ; if (state == 3) strerr_dief1x(101, "current moved twice without being recreated") ; if (c & 0x10) newcurrent = 1 ; if (c & 0x20) { fd_close(fd) ; fd = -1 ; } if (c & 0x40) { fd = open_read("current") ; if (fd < 0) strerr_diefu1sys(111, "current") ; } } static void handle_event (int ifd, int watch) { ssize_t r ; size_t offset = 0 ; union inotify_event_u u ; r = read(ifd, u.buf, sizeof(u.buf)) ; while (r > 0) { struct inotify_event *event = (struct inotify_event *)(u.buf + offset) ; offset += sizeof(struct inotify_event) + event->len ; r -= sizeof(struct inotify_event) + event->len ; if (event->wd == watch && !strcmp(event->name, "current")) { int transition = -1 ; if (event->mask & IN_CREATE) transition = 0 ; else if (event->mask & IN_MOVED_FROM) transition = 1 ; else if (event->mask & IN_MODIFY) transition = 2 ; if (transition >= 0) maketransition(transition) ; } } } int main (int argc, char const *const *argv) { iopause_fd x[2] = { { .events = IOPAUSE_READ }, { .fd = 1 } } ; char const *dir = "." ; int watch ; unsigned int maxlen = 4096 ; PROG = "s6-logwatch" ; { subgetopt_t l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "m:", &l) ; if (opt == -1) break ; switch (opt) { case 'm' : if (!uint0_scan(l.arg, &maxlen)) dieusage() ; strerr_warnw1x("the -m option is deprecated") ; break ; default : dieusage() ; } } argc -= l.ind ; argv += l.ind ; } if (argc) dir = *argv ; if (chdir(dir) < 0) strerr_diefu2sys(111, "chdir to ", dir) ; if (!fd_sanitize()) strerr_diefu1sys(111, "sanitize standard fds") ; x[0].fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC) ; if (x[0].fd < 0) strerr_diefu1sys(111, "inotify_init") ; watch = inotify_add_watch(x[0].fd, ".", IN_CREATE | IN_MOVED_FROM | IN_MODIFY) ; if (watch < 0) strerr_diefu1sys(111, "inotify_add_watch") ; fd = open_readb("current") ; if (fd < 0) { if (errno != ENOENT) strerr_diefu3sys(111, "open ", dir, "/current") ; state = B_WAITING ; } else state = B_READING ; if (sig_ignore(SIGPIPE) == -1) strerr_diefu1sys(111, "sig_ignore(SIGPIPE)") ; if (state == B_READING) { if (!readit(fd)) strerr_diefu3sys(111, "read from ", dir, "/current") ; } for (;;) { int r ; x[1].events = buffer_len(buffer_1) ? IOPAUSE_WRITE : 0 ; r = iopause(x, 2, 0, 0) ; if (r < 0) strerr_diefu1sys(111, "iopause") ; if (x[0].revents & IOPAUSE_EXCEPT) x[0].revents |= IOPAUSE_READ ; if (x[1].revents & IOPAUSE_EXCEPT) x[1].revents |= IOPAUSE_WRITE ; if (x[1].revents & IOPAUSE_WRITE) { if (!buffer_flush(buffer_1) && !error_isagain(errno)) strerr_diefu1sys(111, "write to stdout") ; if (x[1].revents & IOPAUSE_EXCEPT) break ; } if (state == B_READING && buffer_available(buffer_1)) { if (!readit(fd)) strerr_diefu3sys(111, "read from ", dir, "/current") ; } if (x[0].revents & IOPAUSE_READ) handle_event(x[0].fd, watch) ; } return 0 ; } s6-linux-utils-2.5.1.1/src/minutils/s6-freeramdisk.c0000644000000000000000000000103312407015037017004 0ustar /* ISC license. */ #include #include #include #include #include #include #define USAGE "s6-freeramdisk ramdisk_device" int main (int argc, char const *const *argv) { int fd ; PROG = "s6-freeramdisk" ; if (argc < 2) strerr_dieusage(100, USAGE) ; fd = open(argv[1], O_RDWR) ; if (fd < 0) strerr_diefu3sys(111, "open ", argv[1], " in read-write mode") ; if (ioctl(fd, BLKFLSBUF) < 0) strerr_diefu2sys(111, "ioctl ", argv[1]) ; return 0 ; } s6-linux-utils-2.5.1.1/src/include-local/0000755000000000000000000000000012407014651014671 5ustar s6-linux-utils-2.5.1.1/src/include/0000755000000000000000000000000012407014664013605 5ustar s6-linux-utils-2.5.1.1/src/include/s6-linux-utils/0000755000000000000000000000000013541513654016433 5ustar s6-linux-utils-2.5.1.1/package/0002755000000000000000000000000012562635643013000 5ustar s6-linux-utils-2.5.1.1/package/deps.mak0000644000000000000000000000540413553364326014424 0ustar # # This file has been generated by tools/gen-deps.sh # src/minutils/s6-chroot.o src/minutils/s6-chroot.lo: src/minutils/s6-chroot.c src/minutils/s6-fillurandompool.o src/minutils/s6-fillurandompool.lo: src/minutils/s6-fillurandompool.c src/minutils/s6-freeramdisk.o src/minutils/s6-freeramdisk.lo: src/minutils/s6-freeramdisk.c src/minutils/s6-hostname.o src/minutils/s6-hostname.lo: src/minutils/s6-hostname.c src/minutils/s6-logwatch.o src/minutils/s6-logwatch.lo: src/minutils/s6-logwatch.c src/minutils/s6-mount.o src/minutils/s6-mount.lo: src/minutils/s6-mount.c src/minutils/mount-constants.h src/minutils/s6-pivotchroot.o src/minutils/s6-pivotchroot.lo: src/minutils/s6-pivotchroot.c src/minutils/s6-ps.o src/minutils/s6-ps.lo: src/minutils/s6-ps.c src/minutils/s6-ps.h src/minutils/s6-swapoff.o src/minutils/s6-swapoff.lo: src/minutils/s6-swapoff.c src/minutils/s6-swapon.o src/minutils/s6-swapon.lo: src/minutils/s6-swapon.c src/minutils/s6-umount.o src/minutils/s6-umount.lo: src/minutils/s6-umount.c src/minutils/s6ps_grcache.o src/minutils/s6ps_grcache.lo: src/minutils/s6ps_grcache.c src/minutils/s6-ps.h src/minutils/s6ps_otree.o src/minutils/s6ps_otree.lo: src/minutils/s6ps_otree.c src/minutils/s6-ps.h src/minutils/s6ps_pfield.o src/minutils/s6ps_pfield.lo: src/minutils/s6ps_pfield.c src/minutils/s6-ps.h src/minutils/s6ps_pwcache.o src/minutils/s6ps_pwcache.lo: src/minutils/s6ps_pwcache.c src/minutils/s6-ps.h src/minutils/s6ps_statparse.o src/minutils/s6ps_statparse.lo: src/minutils/s6ps_statparse.c src/minutils/s6-ps.h src/minutils/s6ps_ttycache.o src/minutils/s6ps_ttycache.lo: src/minutils/s6ps_ttycache.c src/minutils/s6-ps.h src/minutils/s6ps_wchan.o src/minutils/s6ps_wchan.lo: src/minutils/s6ps_wchan.c src/minutils/s6-ps.h s6-chroot: EXTRA_LIBS := -lskarnet s6-chroot: src/minutils/s6-chroot.o s6-fillurandompool: EXTRA_LIBS := -lskarnet s6-fillurandompool: src/minutils/s6-fillurandompool.o s6-freeramdisk: EXTRA_LIBS := -lskarnet s6-freeramdisk: src/minutils/s6-freeramdisk.o s6-hostname: EXTRA_LIBS := -lskarnet s6-hostname: src/minutils/s6-hostname.o s6-logwatch: EXTRA_LIBS := -lskarnet s6-logwatch: src/minutils/s6-logwatch.o s6-mount: EXTRA_LIBS := -lskarnet s6-mount: src/minutils/s6-mount.o s6-pivotchroot: EXTRA_LIBS := -lskarnet s6-pivotchroot: src/minutils/s6-pivotchroot.o s6-ps: EXTRA_LIBS := -lskarnet ${MAYBEPTHREAD_LIB} s6-ps: src/minutils/s6-ps.o src/minutils/s6ps_statparse.o src/minutils/s6ps_otree.o src/minutils/s6ps_pfield.o src/minutils/s6ps_pwcache.o src/minutils/s6ps_grcache.o src/minutils/s6ps_ttycache.o src/minutils/s6ps_wchan.o ${LIBNSSS} s6-swapoff: EXTRA_LIBS := -lskarnet s6-swapoff: src/minutils/s6-swapoff.o s6-swapon: EXTRA_LIBS := -lskarnet s6-swapon: src/minutils/s6-swapon.o s6-umount: EXTRA_LIBS := -lskarnet s6-umount: src/minutils/s6-umount.o s6-linux-utils-2.5.1.1/package/deps-build0000644000000000000000000000006313336524204014736 0ustar /package/prog/skalibs /package/admin/nsss $usensss s6-linux-utils-2.5.1.1/package/targets.mak0000644000000000000000000000027313334634550015135 0ustar BIN_TARGETS := \ s6-chroot \ s6-fillurandompool \ s6-freeramdisk \ s6-hostname \ s6-logwatch \ s6-mount \ s6-pivotchroot \ s6-ps \ s6-swapoff \ s6-swapon \ s6-umount LIBEXEC_TARGETS := s6-linux-utils-2.5.1.1/package/modes0000644000000000000000000000030313334634643014021 0ustar s6-chroot 0700 s6-fillurandompool 0755 s6-freeramdisk 0700 s6-hostname 0755 s6-logwatch 0755 s6-mount 0700 s6-pivotchroot 0700 s6-ps 0755 s6-swapoff 0700 s6-swapon 0700 s6-umount 0700 s6-linux-utils-2.5.1.1/package/info0000644000000000000000000000013013553360511013634 0ustar package=s6-linux-utils version=2.5.1.1 category=admin package_macro_name=S6_LINUX_UTILS s6-linux-utils-2.5.1.1/COPYING0000644000000000000000000000137013415644374012436 0ustar Copyright (c) 2011-2019 Laurent Bercot Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. s6-linux-utils-2.5.1.1/configure0000755000000000000000000003321513553343654013315 0ustar #!/bin/sh cd `dirname "$0"` . package/info usage () { cat </dev/null 2>&1 && { echo "$1" ; return 0 ; } $1 EOF echo "$1" | sed -e "s/'/'\\\\''/g" -e "1s/^/'/" -e "\$s/\$/'/" -e "s#^'\([-[:alnum:]_,./:]*\)=\(.*\)\$#\1='\2#" -e "s|\*/|* /|g" } fail () { echo "$*" exit 1 } fnmatch () { eval "case \"\$2\" in $1) return 0 ;; *) return 1 ;; esac" } cmdexists () { type "$1" >/dev/null 2>&1 } trycc () { test -z "$CC_AUTO" && cmdexists "$1" && CC_AUTO="$*" } stripdir () { while eval "fnmatch '*/' \"\${$1}\"" ; do eval "$1=\${$1%/}" done } tryflag () { echo "Checking whether compiler accepts $2 ..." echo "typedef int x;" > "$tmpc" if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST "$2" -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then echo " ... yes" eval "$1=\"\${$1} \$2\"" eval "$1=\${$1# }" return 0 else echo " ... no" return 1 fi } tryldflag () { echo "Checking whether linker accepts $2 ..." echo "typedef int x;" > "$tmpc" if $CC_AUTO $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -nostdlib "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then echo " ... yes" eval "$1=\"\${$1} \$2\"" eval "$1=\${$1# }" return 0 else echo " ... no" return 1 fi } # Actual script CC_AUTO= CPPFLAGS_AUTO="-D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -iquote src/include-local -Isrc/include" CPPFLAGS_POST="$CPPFLAGS" CPPFLAGS= CFLAGS_AUTO="-pipe -Wall" CFLAGS_POST="$CFLAGS" CFLAGS=-O2 LDFLAGS_AUTO= LDFLAGS_POST="$LDFLAGS" LDFLAGS= LDFLAGS_NOSHARED= LDFLAGS_SHARED=-shared prefix= exec_prefix='$prefix' dynlibdir='$prefix/lib' libexecdir='$exec_prefix/libexec' bindir='$exec_prefix/bin' libdir='$prefix/lib/$package' includedir='$prefix/include' sysdeps='$prefix/lib/skalibs/sysdeps' manualsysdeps=false shared=false static=true allpic=true slashpackage=false abspath=false usensss=false sproot= home= exthome= allstatic=true evenmorestatic=false addincpath='' addlibspath='' addlibdpath='' vpaths='' vpathd='' build= for arg ; do case "$arg" in --help) usage ;; --prefix=*) prefix=${arg#*=} ;; --exec-prefix=*) exec_prefix=${arg#*=} ;; --dynlibdir=*) dynlibdir=${arg#*=} ;; --libexecdir=*) libexecdir=${arg#*=} ;; --bindir=*) bindir=${arg#*=} ;; --libdir=*) libdir=${arg#*=} ;; --includedir=*) includedir=${arg#*=} ;; --with-sysdeps=*) sysdeps=${arg#*=} manualsysdeps=true ;; --with-include=*) var=${arg#*=} ; stripdir var ; addincpath="$addincpath -I$var" ;; --with-lib=*) var=${arg#*=} ; stripdir var ; addlibspath="$addlibspath -L$var" ; vpaths="$vpaths $var" ;; --with-dynlib=*) var=${arg#*=} ; stripdir var ; addlibdpath="$addlibdpath -L$var" ; vpathd="$vpathd $var" ;; --enable-shared|--enable-shared=yes) shared=true ;; --disable-shared|--enable-shared=no) shared=false ;; --enable-static|--enable-static=yes) static=true ;; --disable-static|--enable-static=no) static=false ;; --enable-allstatic|--enable-allstatic=yes) allstatic=true ;; --disable-allstatic|--enable-allstatic=no) allstatic=false ; evenmorestatic=false ;; --enable-static-libc|--enable-static-libc=yes) allstatic=true ; evenmorestatic=true ;; --disable-static-libc|--enable-static-libc=no) evenmorestatic=false ;; --enable-all-pic|--enable-all-pic=yes) allpic=true ;; --disable-all-pic|--enable-all-pic=no) allpic=false ;; --enable-slashpackage=*) sproot=${arg#*=} ; slashpackage=true ; ;; --enable-slashpackage) sproot= ; slashpackage=true ;; --disable-slashpackage) sproot= ; slashpackage=false ;; --enable-absolute-paths|--enable-absolute-paths=yes) abspath=true ;; --disable-absolute-paths|--enable-absolute-paths=no) abspath=false ;; --enable-nsss|--enable-nsss=yes) usensss=true ;; --disable-nsss|--enable-nsss=no) usensss=false ;; --enable-*|--disable-*|--with-*|--without-*|--*dir=*) ;; --host=*|--target=*) target=${arg#*=} ;; --build=*) build=${arg#*=} ;; -* ) echo "$0: unknown option $arg" ;; *=*) ;; *) target=$arg ;; esac done # Add /usr in the default default case if test -z "$prefix" ; then if test "$libdir" = '$prefix/lib/$package' ; then libdir=/usr/lib/$package fi if test "$includedir" = '$prefix/include' ; then includedir=/usr/include fi if test "$sysdeps" = '$prefix/lib/skalibs/sysdeps' ; then sysdeps=/usr/lib/skalibs/sysdeps fi fi # Expand installation directories stripdir prefix for i in exec_prefix dynlibdir libexecdir bindir libdir includedir sysdeps sproot ; do eval tmp=\${$i} eval $i=$tmp stripdir $i done # Get usable temp filenames i=0 set -C while : ; do i=$(($i+1)) tmpc="./tmp-configure-$$-$PPID-$i.c" tmpe="./tmp-configure-$$-$PPID-$i.tmp" 2>|/dev/null > "$tmpc" && break 2>|/dev/null > "$tmpe" && break test "$i" -gt 50 && fail "$0: cannot create temporary files" done set +C trap 'rm -f "$tmpc" "$tmpe"' EXIT ABRT INT QUIT TERM HUP # Set slashpackage values if $slashpackage ; then home=${sproot}/package/${category}/${package}-${version} exthome=${sproot}/package/${category}/${package} if $manualsysdeps ; then : else sysdeps=${sproot}/package/prog/skalibs/sysdeps fi extbinprefix=${exthome}/command dynlibdir=${home}/library.so bindir=${home}/command libdir=${home}/library libexecdir=$bindir includedir=${home}/include while read dep condvar ; do if test -n "$condvar" ; then eval "cond=$condvar" else cond=true fi if $cond ; then addincpath="$addincpath -I${sproot}${dep}/include" vpaths="$vpaths ${sproot}${dep}/library" addlibspath="$addlibspath -L${sproot}${dep}/library" vpathd="$vpathd ${sproot}${dep}/library.so" addlibdpath="$addlibdpath -L${sproot}${dep}/library.so" fi done < package/deps-build fi # Find a C compiler to use if test -n "$target" && test x${build} != x${target} ; then cross=${target}- else cross= fi echo "Checking for C compiler..." trycc ${CC} if test -n "$CC_AUTO" ; then b=`basename "$CC"` adjust_cross=false if test "$b" != "$CC" ; then adjust_cross=true echo "$0: warning: compiler $CC is declared with its own path. If it's not accessible via PATH, you will need to pass AR, RANLIB and STRIP make variables to the make invocation." 1>&2 fi if test -n "$cross" ; then if test "$b" = "${b##$cross}" ; then echo "$0: warning: compiler $CC is declared as a cross-compiler for target $target but does not start with prefix ${cross}" 1>&2 elif $adjust_cross ; then cross=`dirname "$CC"`/"$cross" fi fi fi trycc ${cross}gcc trycc ${cross}clang trycc ${cross}cc test -n "$CC_AUTO" || { echo "$0: cannot find a C compiler" ; exit 1 ; } echo " ... $CC_AUTO" echo "Checking whether C compiler works... " echo "typedef int x;" > "$tmpc" if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST -c -o /dev/null "$tmpc" 2>"$tmpe" ; then echo " ... yes" else echo " ... no. Compiler output follows:" cat < "$tmpe" exit 1 fi echo "Checking target system type..." if test -z "$target" ; then if test -n "$build" ; then target=$build ; else target=$($CC_AUTO -dumpmachine 2>/dev/null) || target=unknown fi fi echo " ... $target" if test ! -d $sysdeps || test ! -f $sysdeps/target ; then echo "$0: error: $sysdeps is not a valid sysdeps directory" exit 1 fi if [ "x$target" != "x$(cat $sysdeps/target)" ] ; then echo "$0: error: target $target does not match the contents of $sysdeps/target" exit 1 fi spawn_lib=$(cat $sysdeps/spawn.lib) socket_lib=$(cat $sysdeps/socket.lib) sysclock_lib=$(cat $sysdeps/sysclock.lib) timer_lib=$(cat $sysdeps/timer.lib) util_lib=$(cat $sysdeps/util.lib) if $allpic ; then tryflag CPPFLAGS_AUTO -fPIC fi tryflag CFLAGS_AUTO -std=c99 tryflag CFLAGS -fomit-frame-pointer tryflag CFLAGS_AUTO -fno-exceptions tryflag CFLAGS_AUTO -fno-unwind-tables tryflag CFLAGS_AUTO -fno-asynchronous-unwind-tables tryflag CFLAGS_AUTO -Wa,--noexecstack tryflag CFLAGS -fno-stack-protector tryflag CPPFLAGS_AUTO -Werror=implicit-function-declaration tryflag CPPFLAGS_AUTO -Werror=implicit-int tryflag CPPFLAGS_AUTO -Werror=pointer-sign tryflag CPPFLAGS_AUTO -Werror=pointer-arith tryflag CFLAGS_AUTO -ffunction-sections tryflag CFLAGS_AUTO -fdata-sections tryldflag LDFLAGS_AUTO -Wl,--sort-section=alignment tryldflag LDFLAGS_AUTO -Wl,--sort-common CPPFLAGS_AUTO="${CPPFLAGS_AUTO}${addincpath}" if $evenmorestatic ; then LDFLAGS_NOSHARED=-static fi if $shared ; then tryldflag LDFLAGS -Wl,--hash-style=both fi LDFLAGS_SHARED="${LDFLAGS_SHARED}${addlibdpath}" if $allstatic ; then LDFLAGS_NOSHARED="${LDFLAGS_NOSHARED}${addlibspath}" tryldflag LDFLAGS_NOSHARED -Wl,--gc-sections else LDFLAGS_NOSHARED="${LDFLAGS_NOSHARED}${addlibdpath}" fi if test -z "$vpaths" ; then while read dep ; do base=$(basename $dep) ; vpaths="$vpaths /usr/lib/$base" addlibspath="$addlibspath -L/usr/lib/$base" done < package/deps-build fi echo "Creating config.mak..." cmdline=$(quote "$0") for i ; do cmdline="$cmdline $(quote "$i")" ; done exec 3>&1 1>config.mak cat << EOF # This file was generated by: # $cmdline # Any changes made here will be lost if configure is re-run. target := $target package := $package prefix := $prefix exec_prefix := $exec_prefix dynlibdir := $dynlibdir libexecdir := $libexecdir bindir := $bindir libdir := $libdir includedir := $includedir sysdeps := $sysdeps slashpackage := $slashpackage sproot := $sproot version := $version home := $home exthome := $exthome SPAWN_LIB := ${spawn_lib} SOCKET_LIB := ${socket_lib} SYSCLOCK_LIB := ${sysclock_lib} TIMER_LIB := ${timer_lib} UTIL_LIB := ${util_lib} CC := $CC_AUTO CPPFLAGS_AUTO := $CPPFLAGS_AUTO CPPFLAGS := $CPPFLAGS $CPPFLAGS_POST CFLAGS_AUTO := $CFLAGS_AUTO CFLAGS := $CFLAGS $CFLAGS_POST LDFLAGS_AUTO := $LDFLAGS_AUTO LDFLAGS := $LDFLAGS $LDFLAGS_POST LDFLAGS_SHARED := $LDFLAGS_SHARED LDFLAGS_NOSHARED := $LDFLAGS_NOSHARED CROSS_COMPILE := $cross vpath lib%.a$vpaths vpath lib%.so$vpathd EOF if $allstatic ; then echo ".LIBPATTERNS := lib%.a" echo "DO_ALLSTATIC := 1" else echo ".LIBPATTERNS := lib%.so" fi if $static ; then echo "DO_STATIC := 1" else echo "DO_STATIC :=" fi if $shared ; then echo "DO_SHARED := 1" else echo "DO_SHARED :=" fi if $allpic ; then echo "STATIC_LIBS_ARE_PIC := 1" else echo "STATIC_LIBS_ARE_PIC :=" fi if $usensss ; then echo "LIBNSSS := -lnsss" echo "MAYBEPTHREAD_LIB := -lpthread" else echo "LIBNSSS :=" echo "MAYBEPTHREAD_LIB :=" fi exec 1>&3 3>&- echo " ... done." echo "Creating src/include/${package}/config.h..." mkdir -p -m 0755 src/include/${package} exec 3>&1 1> src/include/${package}/config.h cat <&3 3>&- echo " ... done." s6-linux-utils-2.5.1.1/tools/0002755000000000000000000000000013553363665012550 5ustar s6-linux-utils-2.5.1.1/tools/install.sh0000755000000000000000000000167512365207173014553 0ustar #!/bin/sh usage() { echo "usage: $0 [-D] [-l] [-m mode] src dst" 1>&2 exit 1 } mkdirp=false symlink=false mode=0755 while getopts Dlm: name ; do case "$name" in D) mkdirp=true ;; l) symlink=true ;; m) mode=$OPTARG ;; ?) usage ;; esac done shift $(($OPTIND - 1)) test "$#" -eq 2 || usage src=$1 dst=$2 tmp="$dst.tmp.$$" case "$dst" in */) echo "$0: $dst ends in /" 1>&2 ; exit 1 ;; esac set -C set -e if $mkdirp ; then umask 022 case "$2" in */*) mkdir -p "${dst%/*}" ;; esac fi trap 'rm -f "$tmp"' EXIT INT QUIT TERM HUP umask 077 if $symlink ; then ln -s "$src" "$tmp" else cat < "$1" > "$tmp" chmod "$mode" "$tmp" fi mv -f "$tmp" "$dst" if test -d "$dst" ; then rm -f "$dst/$(basename $tmp)" if $symlink ; then mkdir "$tmp" ln -s "$src" "$tmp/$(basename $dst)" mv -f "$tmp/$(basename $dst)" "${dst%/*}" rmdir "$tmp" else echo "$0: $dst is a directory" 1>&2 exit 1 fi fi s6-linux-utils-2.5.1.1/tools/gen-deps.sh0000755000000000000000000000474313553363665014617 0ustar #!/bin/sh -e . package/info echo '#' echo '# This file has been generated by tools/gen-deps.sh' echo '#' echo for dir in src/include/${package} src/* ; do for file in $(ls -1 $dir | grep -- \\.h$) ; do { grep -F -- "#include <${package}/" < ${dir}/$file | cut -d'<' -f2 | cut -d'>' -f1 ; grep -- '#include ".*\.h"' < ${dir}/$file | cut -d'"' -f2 } | sort -u | { deps= while read dep ; do if echo $dep | grep -q "^${package}/" ; then deps="$deps src/include/$dep" elif test -f "${dir}/$dep" ; then deps="$deps ${dir}/$dep" else deps="$deps src/include-local/$dep" fi done if test -n "$deps" ; then echo "${dir}/${file}:${deps}" fi } done done for dir in src/* ; do for file in $(ls -1 $dir | grep -- \\.c$) ; do { grep -F -- "#include <${package}/" < ${dir}/$file | cut -d'<' -f2 | cut -d'>' -f1 ; grep -- '#include ".*\.h"' < ${dir}/$file | cut -d'"' -f2 } | sort -u | { deps=" ${dir}/$file" while read dep ; do if echo $dep | grep -q "^${package}/" ; then deps="$deps src/include/$dep" elif test -f "${dir}/$dep" ; then deps="$deps ${dir}/$dep" else deps="$deps src/include-local/$dep" fi done o=$(echo $file | sed s/\\.c$/.o/) lo=$(echo $file | sed s/\\.c$/.lo/) echo "${dir}/${o} ${dir}/${lo}:${deps}" } done done echo for dir in $(ls -1 src | grep -v ^include) ; do for file in $(ls -1 src/$dir/deps-lib) ; do deps= libs= while read dep ; do if echo $dep | grep -q -e ^-l -e '^\${.*_LIB}' ; then libs="$libs $dep" else deps="$deps src/$dir/$dep" fi done < src/$dir/deps-lib/$file echo 'ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)' echo "lib${file}.a.xyzzy:$deps" echo else echo "lib${file}.a.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')" echo endif echo "lib${file}.so.xyzzy: EXTRA_LIBS :=$libs" echo "lib${file}.so.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')" done for file in $(ls -1 src/$dir/deps-exe) ; do deps= libs= while read dep ; do if echo $dep | grep -q -- \\.o$ ; then dep="src/$dir/$dep" fi if echo $dep | grep -q -e ^-l -e '^\${.*_LIB}' ; then libs="$libs $dep" else deps="$deps $dep" fi done < src/$dir/deps-exe/$file echo "$file: EXTRA_LIBS :=$libs" echo "$file: src/$dir/$file.o$deps" done done s6-linux-utils-2.5.1.1/NEWS0000644000000000000000000000247513553360547012111 0ustar Changelog for s6-linux-utils. In 2.5.1.1 ---------- - Bugfixes. In 2.5.1.0 ---------- - Adaptation to skalibs-2.9.0.0. In 2.5.0.1 ---------- - Build fix for clang. - Adaptation to skalibs-2.8.0.0. - Everything now builds as PIC by default. In 2.5.0.0 ---------- - Optional nsss support. - s6-devd, s6-uevent-listener, s6-uevent-spawner removed. In 2.4.0.2 ---------- - s6-logwatch rewrite. - Better portability with old glibc versions. - s6-uevent-listener and s6-uevent-spawner are marked as deprecated. (The mdevd package obsoletes them.) In 2.4.0.1 ---------- - Adaptation to skalibs-2.6.0.0. The chain-loading programs have changed exit codes when they fail to execute into another program. In 2.4.0.0 ---------- - Linux dependency bumped to 3.5, because the /proc format changed. things *may* work with older kernels, but it's likely that s6-ps will not. - s6-uevent-listener now writes events to stdout instead of spawning a program itself. s6-uevent-spawner now reads on stdin. Instead of running "s6-uevent-listener s6-uevent-spawner mdev", people now run "s6-uevent-listener | s6-uevent-spawner mdev". - s6-devd API unchanged: it hides the details. In 2.3.0.0 ---------- - Added this NEWS file. :) - Major types overhaul to make them more POSIXly correct: compatibility with skalibs-2.5.0.0. s6-linux-utils-2.5.1.1/Makefile0000644000000000000000000001125513515356574013051 0ustar # # This Makefile requires GNU make. # # Do not make changes here. # Use the included .mak files. # it: all make_need := 3.81 ifeq "" "$(strip $(filter $(make_need), $(firstword $(sort $(make_need) $(MAKE_VERSION)))))" fail := $(error Your make ($(MAKE_VERSION)) is too old. You need $(make_need) or newer) endif CC = $(error Please use ./configure first) STATIC_LIBS := SHARED_LIBS := INTERNAL_LIBS := EXTRA_TARGETS := LIB_DEFS := define library_definition LIB$(firstword $(subst =, ,$(1))) := lib$(lastword $(subst =, ,$(1))).$(if $(DO_ALLSTATIC),a,so).xyzzy ifdef DO_SHARED SHARED_LIBS += lib$(lastword $(subst =, ,$(1))).so.xyzzy endif ifdef DO_STATIC STATIC_LIBS += lib$(lastword $(subst =, ,$(1))).a.xyzzy endif endef -include config.mak include package/targets.mak $(foreach var,$(LIB_DEFS),$(eval $(call library_definition,$(var)))) include package/deps.mak version_m := $(basename $(version)) version_M := $(basename $(version_m)) version_l := $(basename $(version_M)) CPPFLAGS_ALL := $(CPPFLAGS_AUTO) $(CPPFLAGS) CFLAGS_ALL := $(CFLAGS_AUTO) $(CFLAGS) ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),) CFLAGS_SHARED := -fPIC else CFLAGS_SHARED := endif LDFLAGS_ALL := $(LDFLAGS_AUTO) $(LDFLAGS) AR := $(CROSS_COMPILE)ar RANLIB := $(CROSS_COMPILE)ranlib STRIP := $(CROSS_COMPILE)strip INSTALL := ./tools/install.sh ALL_BINS := $(LIBEXEC_TARGETS) $(BIN_TARGETS) ALL_LIBS := $(SHARED_LIBS) $(STATIC_LIBS) $(INTERNAL_LIBS) ALL_INCLUDES := $(wildcard src/include/$(package)/*.h) all: $(ALL_LIBS) $(ALL_BINS) $(ALL_INCLUDES) clean: @exec rm -f $(ALL_LIBS) $(ALL_BINS) $(wildcard src/*/*.o src/*/*.lo) $(EXTRA_TARGETS) distclean: clean @exec rm -f config.mak src/include/$(package)/config.h tgz: distclean @. package/info && \ rm -rf /tmp/$$package-$$version && \ cp -a . /tmp/$$package-$$version && \ cd /tmp && \ tar -zpcv --owner=0 --group=0 --numeric-owner --exclude=.git* -f /tmp/$$package-$$version.tar.gz $$package-$$version && \ exec rm -rf /tmp/$$package-$$version strip: $(ALL_LIBS) $(ALL_BINS) ifneq ($(strip $(STATIC_LIBS)),) exec $(STRIP) -x -R .note -R .comment -R .note.GNU-stack $(STATIC_LIBS) endif ifneq ($(strip $(ALL_BINS)$(SHARED_LIBS)),) exec $(STRIP) -R .note -R .comment -R .note.GNU-stack $(ALL_BINS) $(SHARED_LIBS) endif install: install-dynlib install-libexec install-bin install-lib install-include install-dynlib: $(SHARED_LIBS:lib%.so.xyzzy=$(DESTDIR)$(dynlibdir)/lib%.so) install-libexec: $(LIBEXEC_TARGETS:%=$(DESTDIR)$(libexecdir)/%) install-bin: $(BIN_TARGETS:%=$(DESTDIR)$(bindir)/%) install-lib: $(STATIC_LIBS:lib%.a.xyzzy=$(DESTDIR)$(libdir)/lib%.a) install-include: $(ALL_INCLUDES:src/include/$(package)/%.h=$(DESTDIR)$(includedir)/$(package)/%.h) install-data: $(ALL_DATA:src/etc/%=$(DESTDIR)$(datadir)/%) ifneq ($(exthome),) $(DESTDIR)$(exthome): $(DESTDIR)$(home) exec $(INSTALL) -l $(notdir $(home)) $(DESTDIR)$(exthome) update: $(DESTDIR)$(exthome) global-links: $(DESTDIR)$(exthome) $(SHARED_LIBS:lib%.so.xyzzy=$(DESTDIR)$(sproot)/library.so/lib%.so.$(version_M)) $(BIN_TARGETS:%=$(DESTDIR)$(sproot)/command/%) $(DESTDIR)$(sproot)/command/%: $(DESTDIR)$(home)/command/% exec $(INSTALL) -D -l ..$(subst $(sproot),,$(exthome))/command/$( s6-linux-utils: the s6-ps program

s6-linux-utils
Software
skarnet.org

The s6-ps program

s6-ps shows a list of processes on the system.

Interface 

     s6-ps [ -H ] [ -w spacing ] [ -W chanfile ] [ -l | -o field,field,... ]
  • s6-ps assumes the proc filesystem is mounted on /proc. It scans /proc for a list of all processes on the system.
  • It prints a header line, then information about the processes it has found, one process per line. Then it exits 0.
  • If s6-ps is not allowed to read a field, it will print * (a star) instead of the field's content. - (a dash) means the field is unapplicable here, for instance the "tty" field for a process that has no controlling terminal.

Options

  • -H : tree. s6-ps will display he process list as a tree, as ps f does. It will print kernel processes first, then user processes. By default, the processes are simply ordered by increasing pid number, without care for the process hierarchy.
  • -w spacing : leave at least spacing space characters between two adjacent fields. Minimum is 1, default is 2, maximum is 256.
  • -W wchanfile : force wchanfile as the file listing kernel addresses for WCHAN fields. By default, s6-ps tries to use /proc/kallsyms, /boot/System.map-`uname -r`, and /boot/System.map, in that order.
  • -l : long. Equivalent to -o user,pid,cpcpu,pmem,vsize,rss,tty,s,start,cttime,args.
  • -o fieldlist : list of fields to print. fieldlist must be a comma-separated list of fields, without spaces. Fields cannot be duplicated. They will be printed in the given order. The valid field names are listed below. The default field list is user,pid,tty,s,start,args.

Fields

The -o option makes it possible to customize s6-ps's output. Here are the recognized field keywords and the corresponding field they display.

  • pid : the process id number.
  • comm : the command name as known by the kernel.
  • s : the one-character state of the process, then s if the process is a session leader or + if it is a foreground process group leader, then N if the process is niced or < if it is anti-niced. Unlike ps, s6-ps cannot tell whether a process has locked memory pages or not.
  • ppid : the parent process' pid.
  • pgrp : the process group number.
  • sess : the session leader's pid.
  • tty : the name of the process's controlling terminal.
  • tpgid : the pid of the foreground process group.
  • utime : the time the process spent in user mode.
  • stime : the time the process spent in kernel mode.
  • cutime : the time spent in user mode by the process and all its dead children.
  • cstime : the time spent in kernel mode by the process and all its dead children.
  • prio : the process' priority as computed by the kernel.
  • nice : the process' nice value.
  • thcount : the number of threads in the process.
  • start : the start time of the process.
  • vsize : the virtual memory size of the process.
  • rss : the resident set size of the process.
  • rsslimit : the maximum rss allowed for the process.
  • psr : the number of the CPU the process is running on.
  • rtprio : the real-time priority of the process.
  • policy : the real-time policy of the process - a symbolic name.
  • user : the user the process is running as.
  • group : the group the process is running as.
  • pmem : the percentage of the available virtual memory the process is using. Be aware that it is a very rough estimate: determining exactly how much memory a process is using is a complex task.
  • wchan : the name or address of the kernel function where the proces is sleeping. It is actually very rare that a kernel is configured to properly export that value, because it incurs a small performance cost.
  • args : the command line of the process.
  • env : the process environment. s6-ps can normally only print the environment for processes running as the same user, or if it is run as root. Be aware that the environment is usually quite large, and will create very long lines, likely to mess up the display on a standard terminal.
  • pcpu : the percentage of CPU used by the process (total cpu time divided by total running time). It is a mean value and does not reflect current CPU usage.
  • ttime : total CPU time used by the process (user + kernel mode).
  • cttime : total CPU time used by the process and all its dead children (user + kernel mode).
  • tstart : the start time of the process as a TAI64N value.
  • cpcpu : the percentage of CPU used by the process and its dead children (total cpu time divided by total running time). It is a mean value and does not reflect current CPU usage.
s6-linux-utils-2.5.1.1/doc/s6-pivotchroot.html0000644000000000000000000000273613111013165015730 0ustar s6-linux-utils: the s6-pivotchroot program

s6-linux-utils
Software
skarnet.org

The s6-pivotchroot program

s6-pivotchroot performs a pivot_root system call, then changes root to the new root filesystem and executes a program.

Interface 

     s6-pivotchroot newroot putold prog...
  • s6-pivotchroot sets the root filesystem to newroot, which must be a mounted filesystem entry point. The old root filesystem will be available under putold (relative to the old root).
  • s6-pivotchroot changes directory to the new root, performs a chroot system call to the new root, and executes prog with its arguments. prog is searched under the new root.
s6-linux-utils-2.5.1.1/doc/s6-swapon.html0000644000000000000000000000220713111013165014650 0ustar s6-linux-utils: the s6-swapon program

s6-linux-utils
Software
skarnet.org

The s6-swapon program

s6-swapon activates swap partitions.

Interface 

     s6-swapon [ -a | device ]
  • s6-swapon activates the swap on device.
  • If the -a option is given instead of device, s6-swapon looks for partitions marked swap in /etc/fstab and activates them all.
s6-linux-utils-2.5.1.1/doc/index.html0000644000000000000000000001060413553360644014143 0ustar s6-linux-utils - skarnet's tiny Linux-specific utilities

Software
skarnet.org

s6-linux-utils

What is it ?

s6-linux-utils is a set of minimalistic Linux-specific system utilities.

Installation

Requirements

  • A Linux-based system with a standard C development environment. The Linux kernel must be 3.5 or later.
  • GNU make, version 3.81 or later
  • skalibs version 2.9.1.0 or later. It's a build-time requirement. It's also a run-time requirement if you link against the shared version of the skalibs library.

Licensing

s6-linux-utils is free software. It is available under the ISC license.

Download

  • The current released version of s6-linux-utils is 2.5.1.1.
  • Alternatively, you can checkout a copy of the s6-linux-utils git repository: 
     git clone git://git.skarnet.org/s6-linux-utils
  • There's also a GitHub mirror of the s6-linux-utils git repository.

Compilation

  • See the enclosed INSTALL file for installation details.

Upgrade notes

  • This page lists the differences to be aware of between the previous versions of s6-linux-utils and the current one.

Reference

Commands

All these commands exit 111 if they encounter a temporary error, and 100 if they encounter a permanent error - such as a misuse. They exit 127 if they're trying to execute into a program and cannot find it, and 126 if they fail to execute into a program for another reason.

Related resources

  • s6-linux-utils is discussed on the skaware mailing-list.

Similar work

There are several good projects aiming to provide a minimal userspace environment for Linux, suitable for embedded systems. Among them, for instance:

Most of the time, these projects aim to implement standard commands in a lightweight way, and they do it well enough. So, although some standard reimplentation already exists in s6-linux-utils and its sibling package s6-portable-utils, it is an explicit non-goal of those packages to duplicate the work of those projects, and no more rewriting of standard commands will occur.

s6-linux-utils-2.5.1.1/doc/s6-hostname.html0000644000000000000000000000217613111013165015164 0ustar s6-linux-utils: the s6-hostname program

s6-linux-utils
Software
skarnet.org

The s6-hostname program

s6-hostname gets or sets the machine hostname.

Interface 

     s6-hostname [ name ]
  • When called without an argument, s6-hostname prints the machine hostname to stdout.
  • When called with an argument, s6-hostname sets the machine hostname to name.
  • Then it exits 0.
s6-linux-utils-2.5.1.1/doc/s6-mount.html0000644000000000000000000000461713354175770014536 0ustar s6-linux-utils: the s6-mount program

s6-linux-utils
Software
skarnet.org

The s6-mount program

s6-mount mounts filesystems.

Interface 

     s6-mount -a [ -z fstab ]
     s6-mount [ -n ] [ -r | -w ] [ -t fstype ] [ -o option[,option...] ] device mntpoint
  • s6-mount -a mounts all partitions according to /etc/fstab.
  • If the -a option is not given, s6-mount mounts device on mntpoint.
  • s6-mount does not touch /etc/mtab.

Exit codes

  • 0: success
  • 1: mount() returned -EBUSY — most likely, the filesystem is already mounted
  • 100: wrong usage
  • 111: system call failed
  • n: s6-mount -a was called, and n fstab entries couldn't be mounted

Options

  • -a : process /etc/fstab instead of command line arguments
  • -z fstab : read file at fstab instead of /etc/fstab
  • -n : ignored
  • -t fstype : filesystem is of type fstype. You probably need to specify this.
  • -r : mount read-only
  • -w : mount read-write (default)
  • -o option : mount with option option. Currently recognized options: defaults, ro, rw, remount, sync, async, nodev, dev, noexec, exec, nosuid, suid, noatime, atime, nodiratime, diratime, bind, nobind, move, nomove. Unrecognized options are given directly to the kernel.
s6-linux-utils-2.5.1.1/doc/s6-logwatch.html0000644000000000000000000000454113111013165015154 0ustar s6-linux-utils: the s6-logwatch program

s6-linux-utils
Software
skarnet.org

The s6-logwatch program

s6-logwatch watches the current file of a logdir, printing it in real time.

Interface 

     s6-logwatch [ -m buflen ] logdir
  • s6-logwatch prints logdir/current and watches the file.
  • logdir must be managed by a s6-log instance.
  • When new logs are appended to the current file, s6-logwatch prints them in real-time to stdout.
  • When a rotation happens, s6-logwatch notices, and keeps watching the new current file.
  • s6-logwatch runs forever until killed.

Options

  • -m buflen : accumulate at most buflen bytes into the stdout buffer before flushing it. By default, buflen is 4000.

Bugs

  • s6-logwatch is not entirely reliable because there is an unavoidable race condition when a rotation occurs; it's a hack for humans to keep reading logs across rotations, not a tool to be used in safe programming. When the race condition is triggered, s6-logwatch will be unable to understand what state logdir is in and will exit 101 with an error message.
  • Specific support in the logger program would be needed to avoid this race condition; it would significantly bloat the logger program, so it has not been deemed useful.

Notes

  • s6-logwatch is Linux-specific because it uses the inotify interface.
s6-linux-utils-2.5.1.1/doc/s6-freeramdisk.html0000644000000000000000000000173113111013165015636 0ustar s6-linux-utils: the s6-freeramdisk program

s6-linux-utils
Software
skarnet.org

The s6-freeramdisk program

s6-freeramdisk frees the memory occupied by a RAM disk. Call it when your RAM disk is not in use anymore.

Interface 

     s6-freeramdisk ramdisk-device
s6-linux-utils-2.5.1.1/doc/s6-chroot.html0000644000000000000000000000240613111013165014640 0ustar s6-linux-utils: the s6-chroot program

s6-linux-utils
Software
skarnet.org

The s6-chroot program

s6-chroot executes a program in a chroot jail.

Interface 

     s6-chroot newroot prog...
  • s6-chroot sets the root filesystem for the current process to newroot, which must be an existing directory.
  • s6-chroot changes directory to this new root, and executes prog with its arguments. prog is searched under the new root.
  • s6-chroot's parent process is unaffected by the root change.
s6-linux-utils-2.5.1.1/doc/upgrade.html0000644000000000000000000001014413553360704014457 0ustar s6-linux-utils: how to upgrade

s6-linux-utils
Software
skarnet.org

What has changed in s6-linux-utils

in 2.5.1.1

  • skalibs dependency bumped to 2.9.1.0.

in 2.5.1.0

  • skalibs dependency bumped to 2.9.0.0.

in 2.5.0.1

  • skalibs dependency bumped to 2.8.0.0.
  • Everything now builds as PIC by default no matter the toolchain's settings. Use the --disable-all-pic configure option to build executables and static libraries as non-PIC.

in 2.5.0.0

  • skalibs dependency bumped to 2.7.0.0.
  • Optional nsss support added.
  • s6-devd, s6-uevent-listener and s6-uevent-spawner have been removed: mdevd obsoletes them.

in 2.4.0.2

  • skalibs dependency bumped to 2.6.0.2.

in 2.4.0.1

  • skalibs dependency bumped to 2.6.0.0.

in 2.4.0.0

in 2.3.0.0

  • skalibs dependency bumped to 2.5.0.0.

in 2.2.0.0

  • skalibs dependency bumped to 2.4.0.0.
  • s6-halt, s6-poweroff and s6-reboot are not provided by this package anymore: they're now a part of the s6-linux-init package.
  • The s6-fillurandompool program has been added.

in 2.1.0.0

  • skalibs dependency bumped to 2.3.10.0
  • s6-halt, s6-poweroff and s6-reboot have changed behaviours. They now send a signal to process 1 by default; to make them perform a hard shutdown, add the -f option.

in 2.0.2.3

  • GNU make dependency pushed back to 3.81.
  • skalibs dependency bumped to 2.3.8.0

in 2.0.2.2

  • skalibs dependency bumped to 2.3.6.1

in 2.0.2.1

  • skalibs dependency bumped to 2.3.5.1

in 2.0.2.0

in 2.0.1.0

  • skalibs dependency bumped to 2.3.1.0
  • s6-hiercopy removed. (Moved to s6-portable-utils.)

in 2.0.0.1

  • skalibs dependency bumped to 2.1.0.0

in 2.0.0.0

  • The build system has completely changed. It is now a standard ./configure && make && sudo make install build system. See the enclosed INSTALL file for details.
  • slashpackage is not activated by default.
  • shared libraries are not used by default.
  • skalibs dependency bumped to 2.0.0.0
s6-linux-utils-2.5.1.1/doc/s6-fillurandompool.html0000644000000000000000000000470713111013165016556 0ustar s6-linux-utils: the s6-fillurandompool program

s6-linux-utils
Software
skarnet.org

The s6-fillurandompool program

s6-fillurandompool blocks until the machine's /dev/urandom entropy pool is filled up. Then it exits.

Interface 

     s6-fillurandompool

Rationale

For some reason, Linux has two separate entropy pools: one for /dev/random and one for /dev/urandom.

Reading from /dev/random blocks when its entropy pool is not full enough, so it will never return weak random data. (Reading from /dev/random is overkill anyway, and you should not be doing it.)

However, reading from /dev/urandom (which you should be doing) will not block, even though the entropy pool may not have been initialized yet. That's the only insecure thing about it: at boot time, /dev/urandom may return weak random data, until its entropy pool has filled up.

s6-fillurandompool is meant to address this issue. Call it once early on in your boot scripts, before you need any serious random data; when it exits, the /dev/urandom pool has been properly initialized, and it is now safe to read from /dev/urandom every time you need random data, until the machine shuts down.

Notes

  • s6-fillurandompool will only work on a Linux kernel version 3.17 or later: this is when the getrandom() system call, which it internally uses, has been implemented.
s6-linux-utils-2.5.1.1/doc/s6-umount.html0000644000000000000000000000227413111013165014674 0ustar s6-linux-utils: the s6-umount program

s6-linux-utils
Software
skarnet.org

The s6-umount program

s6-umount unmounts filesystems.

Interface 

     s6-umount [ -a | mntpoint ]
  • s6-umount -a unmounts all partitions according to /proc/mounts.
  • If the -a option is not given, s6-umount unmounts the filesystem mounted on mntpoint.
  • s6-umount does not touch /etc/mtab.
s6-linux-utils-2.5.1.1/doc/s6-swapoff.html0000644000000000000000000000220613111013165015005 0ustar s6-linux-utils: the s6-swapoff program

s6-linux-utils
Software
skarnet.org

The s6-swapoff program

s6-swapoff deactivates swap partitions.

Interface 

     s6-swapoff [ -a | device ]
  • s6-swapoff deactivates the swap on device.
  • If the -a option is given instead of device, s6-swapoff looks for swap partitions in /proc/swaps and deactivates them all.