aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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 @@
#define BB_RM
#define BB_RMDIR
#define BB_RMMOD
+#define BB_RPMUNPACK
#define BB_SED
#define BB_SETKEYCODES
#define BB_SH
@@ -101,7 +102,6 @@
#define BB_TR
#define BB_TRUE_FALSE
#define BB_TTY
-#define BB_UNRPM
#define BB_UPTIME
#define BB_USLEEP
#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[] = {
#ifdef BB_RMMOD
{"rmmod", rmmod_main, _BB_DIR_SBIN, rmmod_usage},
#endif
+#ifdef BB_RPMUNPACK
+ {"rpmunpack", rpmunpack_main, _BB_DIR_USR_BIN, rpmunpack_usage},
+#endif
#ifdef BB_SED
{"sed", sed_main, _BB_DIR_BIN, sed_usage},
#endif
@@ -328,9 +331,6 @@ const struct BB_applet applets[] = {
#ifdef BB_UNIX2DOS
{"unix2dos", unix2dos_main, _BB_DIR_USR_BIN, unix2dos_usage},
#endif
-#ifdef BB_UNRPM
- {"unrpm", unrpm_main, _BB_DIR_USR_BIN, unrpm_usage},
-#endif
#ifdef BB_UPDATE
{"update", update_main, _BB_DIR_SBIN, update_usage},
#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[] =
;
#endif
+#if defined BB_RPMUNPACK
+const char rpmunpack_usage[] =
+ "rpmunpack < package.rpm | gunzip | cpio -idmuv\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nExtracts an rpm archive.\n"
+#endif
+ ;
+#endif
+
#if defined BB_SED
const char sed_usage[] =
"sed [-Vhnef] pattern [files...]\n"
@@ -1365,15 +1374,6 @@ const char unix2dos_usage[] =
;
#endif
-#if defined BB_UNRPM
-const char unrpm_usage[] =
- "unrpm < package.rpm | gzip -d | cpio -idmuv\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\nExtracts an rpm archive.\n"
-#endif
- ;
-#endif
-
#if defined BB_UPDATE
const char update_usage[] =
"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);
extern int rm_main(int argc, char** argv);
extern int rmdir_main(int argc, char **argv);
extern int rmmod_main(int argc, char** argv);
+extern int rpmunpack_main(int argc, char** argv);
extern int sed_main(int argc, char** argv);
extern int sfdisk_main(int argc, char** argv);
extern int setkeycodes_main(int argc, char** argv);
@@ -218,7 +219,6 @@ extern int umount_main(int argc, char** argv);
extern int uname_main(int argc, char** argv);
extern int uniq_main(int argc, char** argv);
extern int unix2dos_main(int argc, char** argv);
-extern int unrpm_main(int argc, char** argv);
extern int update_main(int argc, char** argv);
extern int uptime_main(int argc, char** argv);
extern int usleep_main(int argc, char** argv);
@@ -310,6 +310,7 @@ extern const char reset_usage[];
extern const char rm_usage[];
extern const char rmdir_usage[];
extern const char rmmod_usage[];
+extern const char rpmunpack_usage[];
extern const char sed_usage[];
extern const char setkeycodes_usage[];
extern const char shell_usage[];
@@ -332,7 +333,6 @@ extern const char umount_usage[];
extern const char uname_usage[];
extern const char uniq_usage[];
extern const char unix2dos_usage[];
-extern const char unrpm_usage[];
extern const char update_usage[];
extern const char uptime_usage[];
extern 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[] = {
#ifdef BB_RMMOD
{"rmmod", rmmod_main, _BB_DIR_SBIN, rmmod_usage},
#endif
+#ifdef BB_RPMUNPACK
+ {"rpmunpack", rpmunpack_main, _BB_DIR_USR_BIN, rpmunpack_usage},
+#endif
#ifdef BB_SED
{"sed", sed_main, _BB_DIR_BIN, sed_usage},
#endif
@@ -328,9 +331,6 @@ const struct BB_applet applets[] = {
#ifdef BB_UNIX2DOS
{"unix2dos", unix2dos_main, _BB_DIR_USR_BIN, unix2dos_usage},
#endif
-#ifdef BB_UNRPM
- {"unrpm", unrpm_main, _BB_DIR_USR_BIN, unrpm_usage},
-#endif
#ifdef BB_UPDATE
{"update", update_main, _BB_DIR_SBIN, update_usage},
#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);
extern int rm_main(int argc, char** argv);
extern int rmdir_main(int argc, char **argv);
extern int rmmod_main(int argc, char** argv);
+extern int rpmunpack_main(int argc, char** argv);
extern int sed_main(int argc, char** argv);
extern int sfdisk_main(int argc, char** argv);
extern int setkeycodes_main(int argc, char** argv);
@@ -218,7 +219,6 @@ extern int umount_main(int argc, char** argv);
extern int uname_main(int argc, char** argv);
extern int uniq_main(int argc, char** argv);
extern int unix2dos_main(int argc, char** argv);
-extern int unrpm_main(int argc, char** argv);
extern int update_main(int argc, char** argv);
extern int uptime_main(int argc, char** argv);
extern int usleep_main(int argc, char** argv);
@@ -310,6 +310,7 @@ extern const char reset_usage[];
extern const char rm_usage[];
extern const char rmdir_usage[];
extern const char rmmod_usage[];
+extern const char rpmunpack_usage[];
extern const char sed_usage[];
extern const char setkeycodes_usage[];
extern const char shell_usage[];
@@ -332,7 +333,6 @@ extern const char umount_usage[];
extern const char uname_usage[];
extern const char uniq_usage[];
extern const char unix2dos_usage[];
-extern const char unrpm_usage[];
extern const char update_usage[];
extern const char uptime_usage[];
extern 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[] =
;
#endif
+#if defined BB_RPMUNPACK
+const char rpmunpack_usage[] =
+ "rpmunpack < package.rpm | gunzip | cpio -idmuv\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nExtracts an rpm archive.\n"
+#endif
+ ;
+#endif
+
#if defined BB_SED
const char sed_usage[] =
"sed [-Vhnef] pattern [files...]\n"
@@ -1365,15 +1374,6 @@ const char unix2dos_usage[] =
;
#endif
-#if defined BB_UNRPM
-const char unrpm_usage[] =
- "unrpm < package.rpm | gzip -d | cpio -idmuv\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\nExtracts an rpm archive.\n"
-#endif
- ;
-#endif
-
#if defined BB_UPDATE
const char update_usage[] =
"update [options]\n"
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 23:21:00 +0000