Just had a git pull update and compared to last snapshot?
"Michael D. Setzer II via busybox" <[email protected]> Sun, 3 May 2026 07:03:55 +1000
| Newsgroups | gmane.linux.busybox |
|---|---|
| Message-ID | <[email protected]> |
Directory b is latest snapshot c is the directory after git pull.
c has a lot of files that report only in like
Only in c/busybox/util-linux/volume_id: Config.in
Only in c/busybox/util-linux/volume_id: Kbuild
So, someone(s) is/are doing changes?
# diff -r b c | grep -v Only
diff -r b/busybox/include/libbb.h c/busybox/include/libbb.h
1576a1577,1579
> #if !ENABLE_SHOW_USAGE
> #define bb_show_usage() xfunc_die()
> #else
1577a1581
> #endif
diff -r b/busybox/libbb/appletlib.c c/busybox/libbb/appletlib.c
126a127
> #if ENABLE_SHOW_USAGE
129,134c130,134
< if (ENABLE_SHOW_USAGE) {
< ssize_t FAST_FUNC (*full_write_fn)(const char *) =
< xfunc_error_retval ? full_write2_str : full_write1_str;
< #ifdef SINGLE_APPLET_STR
< /* Imagine that this applet is "true". Dont link in printf! */
< const char *usage_string = unpack_usage_messages();
---
> ssize_t FAST_FUNC (*full_write_fn)(const char *) =
> xfunc_error_retval ? full_write2_str : full_write1_str;
> # ifdef SINGLE_APPLET_STR
> /* Imagine that this applet is "true". Dont link in printf! */
> const char *usage_string = unpack_usage_messages();
136,169c136,141
< if (usage_string) {
< if (*usage_string == '\b') {
< full_write_fn("No help available\n");
< } else {
< full_write_fn("Usage: "SINGLE_APPLET_STR" ");
< full_write_fn(usage_string);
< full_write_fn("\n");
< }
< if (ENABLE_FEATURE_CLEAN_UP)
< dealloc_usage_messages((char*)usage_string);
< }
< #else
< const char *p;
< const char *usage_string = p = unpack_usage_messages();
< int ap = find_applet_by_name(applet_name);
<
< if (ap < 0 || usage_string == NULL)
< xfunc_die();
< while (ap) {
< while (*p++) continue;
< ap--;
< }
< full_write_fn(bb_banner);
< full_write_fn(" multi-call binary.\n"); /* common string */
< if (*p == '\b')
< full_write_fn("\nNo help available\n");
< else {
< full_write_fn("\nUsage: ");
< full_write_fn(applet_name);
< if (p[0]) {
< if (p[0] != '\n')
< full_write_fn(" ");
< full_write_fn(p);
< }
---
> if (usage_string) {
> if (*usage_string == '\b') {
> full_write_fn("No help available\n");
> } else {
> full_write_fn("Usage: "SINGLE_APPLET_STR" ");
> full_write_fn(usage_string);
174d145
< #endif
175a147,174
> # else
> const char *p;
> const char *usage_string = p = unpack_usage_messages();
> int ap = find_applet_by_name(applet_name);
>
> if (ap < 0 || usage_string == NULL)
> xfunc_die();
> while (ap) {
> while (*p++) continue;
> ap--;
> }
> full_write_fn(bb_banner);
> full_write_fn(" multi-call binary.\n"); /* common string */
> if (*p == '\b')
> full_write_fn("\nNo help available\n");
> else {
> full_write_fn("\nUsage: ");
> full_write_fn(applet_name);
> if (p[0]) {
> if (p[0] != '\n')
> full_write_fn(" ");
> full_write_fn(p);
> }
> full_write_fn("\n");
> }
> if (ENABLE_FEATURE_CLEAN_UP)
> dealloc_usage_messages((char*)usage_string);
> # endif
177a177
> #endif
+------------------------------------------------------------+
Michael D. Setzer II - Computer Science Instructor (Retired)
mailto:[email protected]
mailto:[email protected]
mailto:[email protected]
Guam - Where America's Day Begins
G4L Disk Imaging Project maintainer
http://sourceforge.net/projects/g4l/
+------------------------------------------------------------+