mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
Added applet_name to contain the applet name.
This commit is contained in:
parent
aec27bca98
commit
7719008a85
@ -354,6 +354,7 @@ const struct BB_applet applets[] = {
|
|||||||
{0}
|
{0}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const char *applet_name;
|
||||||
|
|
||||||
#ifdef BB_FEATURE_INSTALLER
|
#ifdef BB_FEATURE_INSTALLER
|
||||||
/*
|
/*
|
||||||
@ -436,7 +437,6 @@ int uninstall_links() ?
|
|||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
char *s;
|
char *s;
|
||||||
char *name;
|
|
||||||
const struct BB_applet *a = applets;
|
const struct BB_applet *a = applets;
|
||||||
|
|
||||||
#ifdef BB_FEATURE_INSTALLER
|
#ifdef BB_FEATURE_INSTALLER
|
||||||
@ -469,12 +469,12 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
#endif /* BB_FEATURE_INSTALLER */
|
#endif /* BB_FEATURE_INSTALLER */
|
||||||
|
|
||||||
for (s = name = argv[0]; *s != '\0';) {
|
for (s = applet_name = argv[0]; *s != '\0';) {
|
||||||
if (*s++ == '/')
|
if (*s++ == '/')
|
||||||
name = s;
|
applet_name = s;
|
||||||
}
|
}
|
||||||
|
|
||||||
*argv = name;
|
*argv = applet_name;
|
||||||
|
|
||||||
#ifdef BB_SH
|
#ifdef BB_SH
|
||||||
/* Add in a special case hack -- whenever **argv == '-'
|
/* Add in a special case hack -- whenever **argv == '-'
|
||||||
@ -484,7 +484,7 @@ int main(int argc, char **argv)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
while (a->name != 0) {
|
while (a->name != 0) {
|
||||||
if (strcmp(name, a->name) == 0) {
|
if (strcmp(applet_name, a->name) == 0) {
|
||||||
exit(((*(a->main)) (argc, argv)));
|
exit(((*(a->main)) (argc, argv)));
|
||||||
}
|
}
|
||||||
a++;
|
a++;
|
||||||
|
10
busybox.c
10
busybox.c
@ -354,6 +354,7 @@ const struct BB_applet applets[] = {
|
|||||||
{0}
|
{0}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const char *applet_name;
|
||||||
|
|
||||||
#ifdef BB_FEATURE_INSTALLER
|
#ifdef BB_FEATURE_INSTALLER
|
||||||
/*
|
/*
|
||||||
@ -436,7 +437,6 @@ int uninstall_links() ?
|
|||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
char *s;
|
char *s;
|
||||||
char *name;
|
|
||||||
const struct BB_applet *a = applets;
|
const struct BB_applet *a = applets;
|
||||||
|
|
||||||
#ifdef BB_FEATURE_INSTALLER
|
#ifdef BB_FEATURE_INSTALLER
|
||||||
@ -469,12 +469,12 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
#endif /* BB_FEATURE_INSTALLER */
|
#endif /* BB_FEATURE_INSTALLER */
|
||||||
|
|
||||||
for (s = name = argv[0]; *s != '\0';) {
|
for (s = applet_name = argv[0]; *s != '\0';) {
|
||||||
if (*s++ == '/')
|
if (*s++ == '/')
|
||||||
name = s;
|
applet_name = s;
|
||||||
}
|
}
|
||||||
|
|
||||||
*argv = name;
|
*argv = applet_name;
|
||||||
|
|
||||||
#ifdef BB_SH
|
#ifdef BB_SH
|
||||||
/* Add in a special case hack -- whenever **argv == '-'
|
/* Add in a special case hack -- whenever **argv == '-'
|
||||||
@ -484,7 +484,7 @@ int main(int argc, char **argv)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
while (a->name != 0) {
|
while (a->name != 0) {
|
||||||
if (strcmp(name, a->name) == 0) {
|
if (strcmp(applet_name, a->name) == 0) {
|
||||||
exit(((*(a->main)) (argc, argv)));
|
exit(((*(a->main)) (argc, argv)));
|
||||||
}
|
}
|
||||||
a++;
|
a++;
|
||||||
|
@ -208,6 +208,7 @@ extern int which_main(int argc, char** argv);
|
|||||||
extern int whoami_main(int argc, char** argv);
|
extern int whoami_main(int argc, char** argv);
|
||||||
extern int yes_main(int argc, char** argv);
|
extern int yes_main(int argc, char** argv);
|
||||||
|
|
||||||
|
extern const char *applet_name;
|
||||||
|
|
||||||
extern void usage(const char *usage) __attribute__ ((noreturn));
|
extern void usage(const char *usage) __attribute__ ((noreturn));
|
||||||
extern void errorMsg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
|
extern void errorMsg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
|
||||||
|
Loading…
Reference in New Issue
Block a user