diff options
| author | Rob Landley <rob@landley.net> | 2007-12-09 15:30:36 -0600 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2007-12-09 15:30:36 -0600 |
| commit | a8f2580e76da09d623f710affad67ab6610b2c03 (patch) | |
| tree | 96c867366d968dcea3c74cc7db039c66f3acb2eb /toys/toylist.h | |
| parent | fece5cb6d796119eccb1ae0074e5b3aaccbb74ee (diff) | |
| download | toybox-a8f2580e76da09d623f710affad67ab6610b2c03.tar.gz | |
Add -c option to oneit, to specify console other than /dev/tty0.
Diffstat (limited to 'toys/toylist.h')
| -rw-r--r-- | toys/toylist.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/toys/toylist.h b/toys/toylist.h index f24266bb..9d040265 100644 --- a/toys/toylist.h +++ b/toys/toylist.h @@ -63,6 +63,10 @@ struct netcat_data { long delay; // -i delay between lines sent }; +struct oneit_data { + char *console; +}; + struct sleep_data { long seconds; }; @@ -87,6 +91,7 @@ extern union toy_union { struct mke2fs_data mke2fs; struct mkfifo_data mkfifo; struct netcat_data netcat; + struct oneit_data oneit; struct sleep_data sleep; struct touch_data touch; struct toysh_data toysh; @@ -117,10 +122,10 @@ NEWTOY(toybox, NULL, 0) // The rest of these are alphabetical, for binary search. USE_BASENAME(NEWTOY(basename, "<1>2", TOYFLAG_BIN)) -USE_BZCAT(NEWTOY(bzcat, "", TOYFLAG_USR|TOYFLAG_BIN)) +USE_BZCAT(NEWTOY(bzcat, NULL, TOYFLAG_USR|TOYFLAG_BIN)) USE_CATV(NEWTOY(catv, "vte", TOYFLAG_USR|TOYFLAG_BIN)) USE_CHROOT(NEWTOY(chroot, "<1", TOYFLAG_USR|TOYFLAG_SBIN)) -USE_COUNT(NEWTOY(count, "", TOYFLAG_USR|TOYFLAG_BIN)) +USE_COUNT(NEWTOY(count, NULL, TOYFLAG_USR|TOYFLAG_BIN)) USE_TOYSH(NEWTOY(cd, NULL, TOYFLAG_NOFORK)) USE_DF(NEWTOY(df, "Pkt*a", TOYFLAG_USR|TOYFLAG_SBIN)) USE_DIRNAME(NEWTOY(dirname, "<1>1", TOYFLAG_BIN)) @@ -134,7 +139,7 @@ USE_MKE2FS(NEWTOY(mke2fs, MKE2FS_OPTSTRING, TOYFLAG_SBIN)) USE_MKFIFO(NEWTOY(mkfifo, "<1m:", TOYFLAG_BIN)) USE_NETCAT(OLDTOY(nc, netcat, "i#w#l@p#s:q#f:e", TOYFLAG_BIN)) USE_NETCAT(NEWTOY(netcat, "i#w#l@p#s:q#f:e", TOYFLAG_BIN)) -USE_ONEIT(NEWTOY(oneit, "+<1p", TOYFLAG_SBIN)) +USE_ONEIT(NEWTOY(oneit, "+<1c:p", TOYFLAG_SBIN)) USE_PWD(NEWTOY(pwd, NULL, TOYFLAG_BIN)) USE_READLINK(NEWTOY(readlink, "<1f", TOYFLAG_BIN)) USE_TOYSH(OLDTOY(sh, toysh, "c:i", TOYFLAG_BIN)) @@ -146,4 +151,4 @@ USE_TOYSH(NEWTOY(toysh, "c:i", TOYFLAG_BIN)) USE_TRUE(NEWTOY(true, NULL, TOYFLAG_BIN)) USE_TTY(NEWTOY(tty, "s", TOYFLAG_BIN)) USE_WHICH(NEWTOY(which, "a", TOYFLAG_USR|TOYFLAG_BIN)) -USE_YES(NEWTOY(yes, "", TOYFLAG_USR|TOYFLAG_BIN)) +USE_YES(NEWTOY(yes, NULL, TOYFLAG_USR|TOYFLAG_BIN)) |