aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2000-11-29 21:38:11 +0000
committerEric Andersen <andersen@codepoet.org>2000-11-29 21:38:11 +0000
commite500d2083560b2988e7e48e00ba836ce0450c656 (patch)
tree8541687153725cb192f1fac48ddadbb060b4c24e
parentd58ff8731ce635a75406cc8b9629f1041bb4ed32 (diff)
downloadbusybox-w32-e500d2083560b2988e7e48e00ba836ce0450c656.tar.gz
busybox-w32-e500d2083560b2988e7e48e00ba836ce0450c656.tar.bz2
busybox-w32-e500d2083560b2988e7e48e00ba836ce0450c656.zip
Apply a patch fromkent robotti:
Renamed unrpm to original rpmunpack, so you can use an included shell script called unrpm as a front end to it. There's also a shell script called undeb included for debian packages. Change undeb and unrpm scripts to work with the busybox tar and gunzip.
Diffstat
-rw-r--r--Config.h2
-rw-r--r--applets.h6
-rw-r--r--applets/usage.c18
-rw-r--r--busybox.h4
-rw-r--r--include/applets.h6
-rw-r--r--include/busybox.h4
-rw-r--r--usage.c18
7 files changed, 29 insertions, 29 deletions
diff --git a/Config.h b/Config.h
index 82c17d63a..cb798ca25 100644
--- a/Config.h
+++ b/Config.h
@@ -84,6 +84,7 @@
84#define BB_RM 84#define BB_RM
85#define BB_RMDIR 85#define BB_RMDIR
86#define BB_RMMOD 86#define BB_RMMOD
87#define BB_RPMUNPACK
87#define BB_SED 88#define BB_SED
88#define BB_SETKEYCODES 89#define BB_SETKEYCODES
89#define BB_SH 90#define BB_SH
@@ -101,7 +102,6 @@
101#define BB_TR 102#define BB_TR
102#define BB_TRUE_FALSE 103#define BB_TRUE_FALSE
103#define BB_TTY 104#define BB_TTY
104#define BB_UNRPM
105#define BB_UPTIME 105#define BB_UPTIME
106#define BB_USLEEP 106#define BB_USLEEP
107#define BB_WC 107#define BB_WC
diff --git a/applets.h b/applets.h
index f21a49076..a747b8619 100644
--- a/applets.h
+++ b/applets.h
@@ -262,6 +262,9 @@ const struct BB_applet applets[] = {
262#ifdef BB_RMMOD 262#ifdef BB_RMMOD
263 {"rmmod", rmmod_main, _BB_DIR_SBIN, rmmod_usage}, 263 {"rmmod", rmmod_main, _BB_DIR_SBIN, rmmod_usage},
264#endif 264#endif
265#ifdef BB_RPMUNPACK
266 {"rpmunpack", rpmunpack_main, _BB_DIR_USR_BIN, rpmunpack_usage},
267#endif
265#ifdef BB_SED 268#ifdef BB_SED
266 {"sed", sed_main, _BB_DIR_BIN, sed_usage}, 269 {"sed", sed_main, _BB_DIR_BIN, sed_usage},
267#endif 270#endif
@@ -328,9 +331,6 @@ const struct BB_applet applets[] = {
328#ifdef BB_UNIX2DOS 331#ifdef BB_UNIX2DOS
329 {"unix2dos", unix2dos_main, _BB_DIR_USR_BIN, unix2dos_usage}, 332 {"unix2dos", unix2dos_main, _BB_DIR_USR_BIN, unix2dos_usage},
330#endif 333#endif
331#ifdef BB_UNRPM
332 {"unrpm", unrpm_main, _BB_DIR_USR_BIN, unrpm_usage},
333#endif
334#ifdef BB_UPDATE 334#ifdef BB_UPDATE
335 {"update", update_main, _BB_DIR_SBIN, update_usage}, 335 {"update", update_main, _BB_DIR_SBIN, update_usage},
336#endif 336#endif
diff --git a/applets/usage.c b/applets/usage.c
index 423172d7b..93fbf42b9 100644
--- a/applets/usage.c
+++ b/applets/usage.c
@@ -1058,6 +1058,15 @@ const char rmmod_usage[] =
1058 ; 1058 ;
1059#endif 1059#endif
1060 1060
1061#if defined BB_RPMUNPACK
1062const char rpmunpack_usage[] =
1063 "rpmunpack < package.rpm | gunzip | cpio -idmuv\n"
1064#ifndef BB_FEATURE_TRIVIAL_HELP
1065 "\nExtracts an rpm archive.\n"
1066#endif
1067 ;
1068#endif
1069
1061#if defined BB_SED 1070#if defined BB_SED
1062const char sed_usage[] = 1071const char sed_usage[] =
1063 "sed [-Vhnef] pattern [files...]\n" 1072 "sed [-Vhnef] pattern [files...]\n"
@@ -1365,15 +1374,6 @@ const char unix2dos_usage[] =
1365 ; 1374 ;
1366#endif 1375#endif
1367 1376
1368#if defined BB_UNRPM
1369const char unrpm_usage[] =
1370 "unrpm < package.rpm | gzip -d | cpio -idmuv\n"
1371#ifndef BB_FEATURE_TRIVIAL_HELP
1372 "\nExtracts an rpm archive.\n"
1373#endif
1374 ;
1375#endif
1376
1377#if defined BB_UPDATE 1377#if defined BB_UPDATE
1378const char update_usage[] = 1378const char update_usage[] =
1379 "update [options]\n" 1379 "update [options]\n"
diff --git a/busybox.h b/busybox.h
index f0f8d5dd9..3fc91a387 100644
--- a/busybox.h
+++ b/busybox.h
@@ -194,6 +194,7 @@ extern int reset_main(int argc, char** argv);
194extern int rm_main(int argc, char** argv); 194extern int rm_main(int argc, char** argv);
195extern int rmdir_main(int argc, char **argv); 195extern int rmdir_main(int argc, char **argv);
196extern int rmmod_main(int argc, char** argv); 196extern int rmmod_main(int argc, char** argv);
197extern int rpmunpack_main(int argc, char** argv);
197extern int sed_main(int argc, char** argv); 198extern int sed_main(int argc, char** argv);
198extern int sfdisk_main(int argc, char** argv); 199extern int sfdisk_main(int argc, char** argv);
199extern int setkeycodes_main(int argc, char** argv); 200extern int setkeycodes_main(int argc, char** argv);
@@ -218,7 +219,6 @@ extern int umount_main(int argc, char** argv);
218extern int uname_main(int argc, char** argv); 219extern int uname_main(int argc, char** argv);
219extern int uniq_main(int argc, char** argv); 220extern int uniq_main(int argc, char** argv);
220extern int unix2dos_main(int argc, char** argv); 221extern int unix2dos_main(int argc, char** argv);
221extern int unrpm_main(int argc, char** argv);
222extern int update_main(int argc, char** argv); 222extern int update_main(int argc, char** argv);
223extern int uptime_main(int argc, char** argv); 223extern int uptime_main(int argc, char** argv);
224extern int usleep_main(int argc, char** argv); 224extern int usleep_main(int argc, char** argv);
@@ -310,6 +310,7 @@ extern const char reset_usage[];
310extern const char rm_usage[]; 310extern const char rm_usage[];
311extern const char rmdir_usage[]; 311extern const char rmdir_usage[];
312extern const char rmmod_usage[]; 312extern const char rmmod_usage[];
313extern const char rpmunpack_usage[];
313extern const char sed_usage[]; 314extern const char sed_usage[];
314extern const char setkeycodes_usage[]; 315extern const char setkeycodes_usage[];
315extern const char shell_usage[]; 316extern const char shell_usage[];
@@ -332,7 +333,6 @@ extern const char umount_usage[];
332extern const char uname_usage[]; 333extern const char uname_usage[];
333extern const char uniq_usage[]; 334extern const char uniq_usage[];
334extern const char unix2dos_usage[]; 335extern const char unix2dos_usage[];
335extern const char unrpm_usage[];
336extern const char update_usage[]; 336extern const char update_usage[];
337extern const char uptime_usage[]; 337extern const char uptime_usage[];
338extern const char usleep_usage[]; 338extern const char usleep_usage[];
diff --git a/include/applets.h b/include/applets.h
index f21a49076..a747b8619 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -262,6 +262,9 @@ const struct BB_applet applets[] = {
262#ifdef BB_RMMOD 262#ifdef BB_RMMOD
263 {"rmmod", rmmod_main, _BB_DIR_SBIN, rmmod_usage}, 263 {"rmmod", rmmod_main, _BB_DIR_SBIN, rmmod_usage},
264#endif 264#endif
265#ifdef BB_RPMUNPACK
266 {"rpmunpack", rpmunpack_main, _BB_DIR_USR_BIN, rpmunpack_usage},
267#endif
265#ifdef BB_SED 268#ifdef BB_SED
266 {"sed", sed_main, _BB_DIR_BIN, sed_usage}, 269 {"sed", sed_main, _BB_DIR_BIN, sed_usage},
267#endif 270#endif
@@ -328,9 +331,6 @@ const struct BB_applet applets[] = {
328#ifdef BB_UNIX2DOS 331#ifdef BB_UNIX2DOS
329 {"unix2dos", unix2dos_main, _BB_DIR_USR_BIN, unix2dos_usage}, 332 {"unix2dos", unix2dos_main, _BB_DIR_USR_BIN, unix2dos_usage},
330#endif 333#endif
331#ifdef BB_UNRPM
332 {"unrpm", unrpm_main, _BB_DIR_USR_BIN, unrpm_usage},
333#endif
334#ifdef BB_UPDATE 334#ifdef BB_UPDATE
335 {"update", update_main, _BB_DIR_SBIN, update_usage}, 335 {"update", update_main, _BB_DIR_SBIN, update_usage},
336#endif 336#endif
diff --git a/include/busybox.h b/include/busybox.h
index f0f8d5dd9..3fc91a387 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -194,6 +194,7 @@ extern int reset_main(int argc, char** argv);
194extern int rm_main(int argc, char** argv); 194extern int rm_main(int argc, char** argv);
195extern int rmdir_main(int argc, char **argv); 195extern int rmdir_main(int argc, char **argv);
196extern int rmmod_main(int argc, char** argv); 196extern int rmmod_main(int argc, char** argv);
197extern int rpmunpack_main(int argc, char** argv);
197extern int sed_main(int argc, char** argv); 198extern int sed_main(int argc, char** argv);
198extern int sfdisk_main(int argc, char** argv); 199extern int sfdisk_main(int argc, char** argv);
199extern int setkeycodes_main(int argc, char** argv); 200extern int setkeycodes_main(int argc, char** argv);
@@ -218,7 +219,6 @@ extern int umount_main(int argc, char** argv);
218extern int uname_main(int argc, char** argv); 219extern int uname_main(int argc, char** argv);
219extern int uniq_main(int argc, char** argv); 220extern int uniq_main(int argc, char** argv);
220extern int unix2dos_main(int argc, char** argv); 221extern int unix2dos_main(int argc, char** argv);
221extern int unrpm_main(int argc, char** argv);
222extern int update_main(int argc, char** argv); 222extern int update_main(int argc, char** argv);
223extern int uptime_main(int argc, char** argv); 223extern int uptime_main(int argc, char** argv);
224extern int usleep_main(int argc, char** argv); 224extern int usleep_main(int argc, char** argv);
@@ -310,6 +310,7 @@ extern const char reset_usage[];
310extern const char rm_usage[]; 310extern const char rm_usage[];
311extern const char rmdir_usage[]; 311extern const char rmdir_usage[];
312extern const char rmmod_usage[]; 312extern const char rmmod_usage[];
313extern const char rpmunpack_usage[];
313extern const char sed_usage[]; 314extern const char sed_usage[];
314extern const char setkeycodes_usage[]; 315extern const char setkeycodes_usage[];
315extern const char shell_usage[]; 316extern const char shell_usage[];
@@ -332,7 +333,6 @@ extern const char umount_usage[];
332extern const char uname_usage[]; 333extern const char uname_usage[];
333extern const char uniq_usage[]; 334extern const char uniq_usage[];
334extern const char unix2dos_usage[]; 335extern const char unix2dos_usage[];
335extern const char unrpm_usage[];
336extern const char update_usage[]; 336extern const char update_usage[];
337extern const char uptime_usage[]; 337extern const char uptime_usage[];
338extern const char usleep_usage[]; 338extern const char usleep_usage[];
diff --git a/usage.c b/usage.c
index 423172d7b..93fbf42b9 100644
--- a/usage.c
+++ b/usage.c
@@ -1058,6 +1058,15 @@ const char rmmod_usage[] =
1058 ; 1058 ;
1059#endif 1059#endif
1060 1060
1061#if defined BB_RPMUNPACK
1062const char rpmunpack_usage[] =
1063 "rpmunpack < package.rpm | gunzip | cpio -idmuv\n"
1064#ifndef BB_FEATURE_TRIVIAL_HELP
1065 "\nExtracts an rpm archive.\n"
1066#endif
1067 ;
1068#endif
1069
1061#if defined BB_SED 1070#if defined BB_SED
1062const char sed_usage[] = 1071const char sed_usage[] =
1063 "sed [-Vhnef] pattern [files...]\n" 1072 "sed [-Vhnef] pattern [files...]\n"
@@ -1365,15 +1374,6 @@ const char unix2dos_usage[] =
1365 ; 1374 ;
1366#endif 1375#endif
1367 1376
1368#if defined BB_UNRPM
1369const char unrpm_usage[] =
1370 "unrpm < package.rpm | gzip -d | cpio -idmuv\n"
1371#ifndef BB_FEATURE_TRIVIAL_HELP
1372 "\nExtracts an rpm archive.\n"
1373#endif
1374 ;
1375#endif
1376
1377#if defined BB_UPDATE 1377#if defined BB_UPDATE
1378const char update_usage[] = 1378const char update_usage[] =
1379 "update [options]\n" 1379 "update [options]\n"
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 12:26:28 +0000