diff options
| author | Matthew Stoltenberg <d3matt@gmail.com> | 2009-08-13 00:59:32 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-08-13 00:59:32 +0200 |
| commit | 4803db53b874aa5182944927c10d632333ad4f0e (patch) | |
| tree | 0f1a0569497f1135ca269a56292a9f0b233b6e88 /miscutils | |
| parent | dbfa45b3b23d882a7ff3e9ef4bf84378e6b9a4a8 (diff) | |
| download | busybox-w32-4803db53b874aa5182944927c10d632333ad4f0e.tar.gz busybox-w32-4803db53b874aa5182944927c10d632333ad4f0e.tar.bz2 busybox-w32-4803db53b874aa5182944927c10d632333ad4f0e.zip | |
volname: new applet
function old new delta
volname_main - 90 +90
packed_usage 26373 26387 +14
applet_names 2078 2086 +8
applet_main 1232 1236 +4
applet_nameofs 616 618 +2
applet_install_loc 154 155 +1
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 5/0 up/down: 119/0) Total: 119 bytes
Signed-off-by: Matthew Stoltenberg <d3matt@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'miscutils')
| -rw-r--r-- | miscutils/Config.in | 6 | ||||
| -rw-r--r-- | miscutils/Kbuild | 1 | ||||
| -rw-r--r-- | miscutils/volname.c | 54 |
3 files changed, 61 insertions, 0 deletions
diff --git a/miscutils/Config.in b/miscutils/Config.in index 06ff51a7c..689044794 100644 --- a/miscutils/Config.in +++ b/miscutils/Config.in | |||
| @@ -584,6 +584,12 @@ config TTYSIZE | |||
| 584 | error, but returns default 80x24. | 584 | error, but returns default 80x24. |
| 585 | Usage in shell scripts: width=`ttysize w`. | 585 | Usage in shell scripts: width=`ttysize w`. |
| 586 | 586 | ||
| 587 | config VOLNAME | ||
| 588 | bool "volname" | ||
| 589 | default n | ||
| 590 | help | ||
| 591 | Prints a CD-ROM volume name. | ||
| 592 | |||
| 587 | config WATCHDOG | 593 | config WATCHDOG |
| 588 | bool "watchdog" | 594 | bool "watchdog" |
| 589 | default n | 595 | default n |
diff --git a/miscutils/Kbuild b/miscutils/Kbuild index 8ae8a488a..e378a099f 100644 --- a/miscutils/Kbuild +++ b/miscutils/Kbuild | |||
| @@ -40,4 +40,5 @@ lib-$(CONFIG_TASKSET) += taskset.o | |||
| 40 | lib-$(CONFIG_TIME) += time.o | 40 | lib-$(CONFIG_TIME) += time.o |
| 41 | lib-$(CONFIG_TIMEOUT) += timeout.o | 41 | lib-$(CONFIG_TIMEOUT) += timeout.o |
| 42 | lib-$(CONFIG_TTYSIZE) += ttysize.o | 42 | lib-$(CONFIG_TTYSIZE) += ttysize.o |
| 43 | lib-$(CONFIG_VOLNAME) += volname.o | ||
| 43 | lib-$(CONFIG_WATCHDOG) += watchdog.o | 44 | lib-$(CONFIG_WATCHDOG) += watchdog.o |
diff --git a/miscutils/volname.c b/miscutils/volname.c new file mode 100644 index 000000000..a5174e636 --- /dev/null +++ b/miscutils/volname.c | |||
| @@ -0,0 +1,54 @@ | |||
| 1 | /* | ||
| 2 | * Reads and displays CD-ROM volume name | ||
| 3 | * | ||
| 4 | * Several people have asked how to read CD volume names so I wrote this | ||
| 5 | * small program to do it. | ||
| 6 | * | ||
| 7 | * usage: volname [<device-file>] | ||
| 8 | * | ||
| 9 | * Copyright (C) 2000-2001 Jeff Tranter (tranter@pobox.com) | ||
| 10 | * | ||
| 11 | * This program is free software; you can redistribute it and/or modify | ||
| 12 | * it under the terms of the GNU General Public License as published by | ||
| 13 | * the Free Software Foundation; either version 2 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | * This program is distributed in the hope that it will be useful, | ||
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 20 | * | ||
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with this program; if not, write to the Free Software | ||
| 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 24 | */ | ||
| 25 | |||
| 26 | /* | ||
| 27 | * mods from distrubuted source (eject-2.0.13) are by | ||
| 28 | * Matthew Stoltenberg <d3matt@gmail.com> | ||
| 29 | */ | ||
| 30 | #include "libbb.h" | ||
| 31 | |||
| 32 | int volname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | ||
| 33 | int volname_main(int argc UNUSED_PARAM, char **argv) | ||
| 34 | { | ||
| 35 | int fd; | ||
| 36 | char buffer[32]; | ||
| 37 | const char *device; | ||
| 38 | |||
| 39 | device = "/dev/cdrom"; | ||
| 40 | if (argv[1]) { | ||
| 41 | device = argv[1]; | ||
| 42 | if (argv[2]) | ||
| 43 | bb_show_usage(); | ||
| 44 | } | ||
| 45 | |||
| 46 | fd = xopen(device, O_RDONLY); | ||
| 47 | xlseek(fd, 32808, SEEK_SET); | ||
| 48 | xread(fd, buffer, 32); | ||
| 49 | printf("%32.32s\n", buffer); | ||
| 50 | if (ENABLE_FEATURE_CLEAN_UP) { | ||
| 51 | close(fd); | ||
| 52 | } | ||
| 53 | return 0; | ||
| 54 | } | ||