All of lore.kernel.org
 help / color / mirror / Atom feed
From: jacmet at uclibc.org <jacmet@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package/busybox
Date: Sun,  6 Jul 2008 06:55:56 -0700 (PDT)	[thread overview]
Message-ID: <20080706135556.9B3C03C650@busybox.net> (raw)

Author: jacmet
Date: 2008-07-06 06:55:55 -0700 (Sun, 06 Jul 2008)
New Revision: 22667

Log:
busybox: more 1.11.0 patches

Added:
   trunk/buildroot/package/busybox/busybox-1.11.0-man.patch
   trunk/buildroot/package/busybox/busybox-1.11.0-uname.patch


Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.11.0-man.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.0-man.patch	                        (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.11.0-man.patch	2008-07-06 13:55:55 UTC (rev 22667)
@@ -0,0 +1,40 @@
+--- busybox-1.11.0/miscutils/man.c	Wed Jun 25 14:51:35 2008
++++ busybox-1.11.0-man/miscutils/man.c	Fri Jul  4 23:55:56 2008
+@@ -73,7 +73,7 @@
+ 	char *sec_list;
+ 	char *cur_path, *cur_sect;
+ 	char *line, *value;
+-	int count_mp, alloc_mp, cur_mp;
++	int count_mp, cur_mp;
+ 	int opt;
+ 
+ 	opt_complementary = "-1"; /* at least one argument */
+@@ -81,8 +81,8 @@
+ 	argv += optind;
+ 
+ 	sec_list = xstrdup("1:2:3:4:5:6:7:8:9");
+-	alloc_mp = 10;
+-	man_path_list = xmalloc(10 * sizeof(man_path_list[0]));
++	/* Last valid man_path_list[] is [0x10] */
++	man_path_list = xzalloc(0x11 * sizeof(man_path_list[0]));
+ 	count_mp = 0;
+ 	man_path_list[0] = xstrdup(getenv("MANPATH"));
+ 	if (man_path_list[0])
+@@ -107,11 +107,13 @@
+ 				if (strcmp("MANPATH", line) == 0) {
+ 					man_path_list[count_mp] = xstrdup(value);
+ 					count_mp++;
+-					if (alloc_mp == count_mp) {
+-						alloc_mp += 10;
+-						man_path_list = xrealloc(man_path_list, alloc_mp * sizeof(man_path_list[0]));
++					/* man_path_list is NULL terminated */
++					man_path_list[count_mp] = NULL;
++					if (!(count_mp & 0xf)) { /* 0x10, 0x20 etc */
++						/* so that last valid man_path_list[] is [count_mp + 0x10] */
++						man_path_list = xrealloc(man_path_list,
++							(count_mp + 0x11) * sizeof(man_path_list[0]));
+ 					}
+-					/* thus man_path_list is always NULL terminated */
+ 				}
+ 				if (strcmp("MANSECT", line) == 0) {
+ 					free(sec_list);

Added: trunk/buildroot/package/busybox/busybox-1.11.0-uname.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.0-uname.patch	                        (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.11.0-uname.patch	2008-07-06 13:55:55 UTC (rev 22667)
@@ -0,0 +1,108 @@
+--- busybox-1.11.0/applets/individual.c	Wed Jun 25 14:51:37 2008
++++ busybox-1.11.0-uname/applets/individual.c	Wed Jul  2 13:32:17 2008
+@@ -14,13 +14,11 @@
+ int main(int argc, char **argv)
+ {
+ 	applet_name = argv[0];
+-
+ 	return APPLET_main(argc,argv);
+ }
+ 
+ void bb_show_usage(void)
+ {
+-	printf(APPLET_full_usage "\n");
+-
++	fputs(APPLET_full_usage "\n", stdout);
+ 	exit(EXIT_FAILURE);
+ }
+--- busybox-1.11.0/coreutils/uname.c	Wed Jun 25 14:51:30 2008
++++ busybox-1.11.0-uname/coreutils/uname.c	Wed Jul  2 13:32:17 2008
+@@ -17,7 +17,7 @@
+    -m, --machine	sun
+    -a, --all		SunOS rocky8 4.0  sun
+ 
+-   The default behavior is equivalent to `-s'.
++   The default behavior is equivalent to '-s'.
+ 
+    David MacKenzie <djm@gnu.ai.mit.edu> */
+ 
+@@ -39,47 +39,43 @@
+ } uname_info_t;
+ 
+ static const char options[] ALIGN1 = "snrvmpa";
+-static const unsigned short utsname_offset[] ALIGN2 = {
+-	offsetof(uname_info_t,name.sysname),
+-	offsetof(uname_info_t,name.nodename),
+-	offsetof(uname_info_t,name.release),
+-	offsetof(uname_info_t,name.version),
+-	offsetof(uname_info_t,name.machine),
+-	offsetof(uname_info_t,processor)
++static const unsigned short utsname_offset[] = {
++	offsetof(uname_info_t, name.sysname),
++	offsetof(uname_info_t, name.nodename),
++	offsetof(uname_info_t, name.release),
++	offsetof(uname_info_t, name.version),
++	offsetof(uname_info_t, name.machine),
++	offsetof(uname_info_t, processor)
+ };
+ 
+ int uname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+-int uname_main(int argc, char **argv)
++int uname_main(int argc ATTRIBUTE_UNUSED, char **argv)
+ {
+ 	uname_info_t uname_info;
+ #if defined(__sparc__) && defined(__linux__)
+ 	char *fake_sparc = getenv("FAKE_SPARC");
+ #endif
+-	const unsigned short int *delta;
++	const unsigned short *delta;
+ 	char toprint;
+ 
+ 	toprint = getopt32(argv, options);
+ 
+-	if (argc != optind) {
++	if (argv[optind]) { /* coreutils-6.9 compat */
+ 		bb_show_usage();
+ 	}
+ 
+-	if (toprint & (1 << 6)) {
++	if (toprint & (1 << 6)) { /* -a => all opts on */
+ 		toprint = 0x3f;
+ 	}
+ 
+-	if (toprint == 0) {
+-		toprint = 1;			/* sysname */
++	if (toprint == 0) { /* no opts => -s (sysname) */
++		toprint = 1;
+ 	}
+ 
+-	if (uname(&uname_info.name) == -1) {
+-		bb_error_msg_and_die("cannot get system name");
+-	}
++	uname(&uname_info.name); /* never fails */
+ 
+ #if defined(__sparc__) && defined(__linux__)
+-	if ((fake_sparc != NULL)
+-		&& ((fake_sparc[0] == 'y')
+-			|| (fake_sparc[0] == 'Y'))) {
++	if (fake_sparc && (fake_sparc[0] | 0x20) == 'y') {
+ 		strcpy(uname_info.name.machine, "sparc");
+ 	}
+ #endif
+@@ -89,7 +85,8 @@
+ 	delta = utsname_offset;
+ 	do {
+ 		if (toprint & 1) {
+-			printf(((char *)(&uname_info)) + *delta);
++			/* printf would not be safe here */
++			fputs((char *)(&uname_info) + *delta, stdout);
+ 			if (toprint > 1) {
+ 				bb_putchar(' ');
+ 			}
+@@ -98,5 +95,5 @@
+ 	} while (toprint >>= 1);
+ 	bb_putchar('\n');
+ 
+-	fflush_stdout_and_exit(EXIT_SUCCESS);
++	fflush_stdout_and_exit(EXIT_SUCCESS); /* coreutils-6.9 compat */
+ }

             reply	other threads:[~2008-07-06 13:55 UTC|newest]

Thread overview: 161+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-06 13:55 jacmet at uclibc.org [this message]
  -- strict thread matches above, loose matches on Subject: below --
2009-03-02 15:33 [Buildroot] svn commit: trunk/buildroot/package/busybox jacmet at uclibc.org
2009-02-18 14:16 jacmet at uclibc.org
2009-02-01 19:36 jacmet at uclibc.org
2009-01-29 11:29 jacmet at uclibc.org
2009-01-29 11:27 jacmet at uclibc.org
2009-01-20 19:26 jacmet at uclibc.org
2009-01-19 12:34 jacmet at uclibc.org
2009-01-12  9:36 jacmet at uclibc.org
2008-12-31  9:35 jacmet at uclibc.org
2008-12-30 19:15 jacmet at uclibc.org
2008-12-29 10:09 jacmet at uclibc.org
2008-12-11  9:35 jacmet at uclibc.org
2008-12-10 13:46 jacmet at uclibc.org
2008-12-07 21:22 jacmet at uclibc.org
2008-12-04 13:21 jacmet at uclibc.org
2008-11-29 20:12 jacmet at uclibc.org
2008-11-28  8:19 jacmet at uclibc.org
2008-11-22  6:49 jacmet at uclibc.org
2008-11-21 14:36 jacmet at uclibc.org
2008-11-21 10:59 jacmet at uclibc.org
2008-11-20  6:49 jacmet at uclibc.org
2008-11-17  7:40 jacmet at uclibc.org
2008-11-16 17:22 jacmet at uclibc.org
2008-11-16 23:46 ` Hamish Moffatt
2008-11-17  7:13   ` Peter Korsgaard
2008-11-17 12:38     ` Hamish Moffatt
2008-11-17 12:45       ` Peter Korsgaard
2008-11-15 21:25 jacmet at uclibc.org
2008-11-13 16:32 jacmet at uclibc.org
2008-11-14 16:42 ` hartleys
2008-11-15 21:29   ` Peter Korsgaard
2008-11-16 23:42     ` Hamish Moffatt
2008-11-17  7:13       ` Peter Korsgaard
2008-11-13 16:32 jacmet at uclibc.org
2008-11-07 10:16 jacmet at uclibc.org
2008-11-02 13:06 jacmet at uclibc.org
2008-10-13 12:42 jacmet at uclibc.org
2008-10-06 18:52 jacmet at uclibc.org
2008-09-28 19:28 jacmet at uclibc.org
2008-09-22 11:54 jacmet at uclibc.org
2008-09-09  8:50 jacmet at uclibc.org
2008-09-09  8:50 jacmet at uclibc.org
2008-09-10  1:32 ` Hamish Moffatt
2008-09-10  6:57   ` Peter Korsgaard
2008-08-31 21:45 jacmet at uclibc.org
2008-08-28  4:57 jacmet at uclibc.org
2008-08-26  1:05 hamish at uclibc.org
2008-08-21  5:08 jacmet at uclibc.org
2008-08-06 12:56 jacmet at uclibc.org
2008-08-06  6:37 jacmet at uclibc.org
2008-08-04 19:06 jacmet at uclibc.org
2008-07-23  6:01 jacmet at uclibc.org
2008-07-22 11:19 jacmet at uclibc.org
2008-07-11 22:19 jacmet at uclibc.org
2008-07-01 14:04 jacmet at uclibc.org
2008-07-01 13:37 jacmet at uclibc.org
2008-06-28 20:53 jacmet at uclibc.org
2008-06-26  6:51 jacmet at uclibc.org
2008-06-26  6:51 jacmet at uclibc.org
2008-06-26  6:58 ` Peter Korsgaard
2008-06-27  9:05   ` Daniel Laird
2008-06-27  9:20     ` Peter Korsgaard
2008-06-27 12:00       ` Bernhard Fischer
2008-06-27 12:46         ` sjhill at realitydiluted.com
2008-06-27 12:53           ` Bernhard Fischer
2008-06-27 14:07           ` Peter Korsgaard
2008-06-27 12:49         ` Daniel Laird
2008-06-27 13:19           ` Peter Korsgaard
2008-06-26  6:51 jacmet at uclibc.org
2008-06-20 18:38 jacmet at uclibc.org
2008-06-13 20:49 jacmet at uclibc.org
2008-06-07  7:46 jacmet at uclibc.org
2008-05-31 12:58 jacmet at uclibc.org
2008-05-31  7:28 jacmet at uclibc.org
2008-05-31  7:39 ` Cristian Ionescu-Idbohrn
2008-05-31 12:59   ` Peter Korsgaard
2008-05-09 10:01 jacmet at uclibc.org
2008-05-05 17:17 jacmet at uclibc.org
2008-04-29  6:53 jacmet at uclibc.org
2008-04-22  9:37 jacmet at uclibc.org
2008-04-04  7:17 jacmet at uclibc.org
2008-04-01 10:00 jacmet at uclibc.org
2008-03-30 14:37 jacmet at uclibc.org
2008-03-26 21:53 jacmet at uclibc.org
2008-03-26 21:49 jacmet at uclibc.org
2008-03-25 14:38 jacmet at uclibc.org
2008-03-21 17:56 ninevoltz at uclibc.org
2008-03-21 10:14 jacmet at uclibc.org
2008-03-17 19:44 jacmet at uclibc.org
2008-03-11  8:17 jacmet at uclibc.org
2008-02-28 14:38 jacmet at uclibc.org
2008-02-14 15:49 jacmet at uclibc.org
2008-02-14 14:45 jacmet at uclibc.org
2008-02-02 21:49 jacmet at uclibc.org
2008-01-08 12:51 jacmet at uclibc.org
2008-01-03 13:33 jacmet at uclibc.org
2008-01-03 13:33 jacmet at uclibc.org
2008-01-03 13:33 jacmet at uclibc.org
2008-01-03 13:33 jacmet at uclibc.org
2008-01-03 13:33 jacmet at uclibc.org
2008-01-03 13:31 jacmet at uclibc.org
2007-09-30 12:50 aldot at uclibc.org
2007-09-30 12:48 aldot at uclibc.org
2007-09-22 17:29 aldot at uclibc.org
2007-09-22 10:25 aldot at uclibc.org
2007-09-20 16:58 aldot at uclibc.org
2007-09-15 18:14 aldot at uclibc.org
2007-09-10  7:38 jacmet at uclibc.org
2007-09-02 22:09 aldot at uclibc.org
2007-09-02 14:56 aldot at uclibc.org
2007-09-01 17:33 aldot at uclibc.org
2007-08-24 14:23 aldot at uclibc.org
2007-07-08 12:10 aldot at uclibc.org
2007-07-08 12:04 aldot at uclibc.org
2007-07-08 11:56 aldot at uclibc.org
2007-07-02 15:20 aldot at uclibc.org
2007-07-02  9:54 aldot at uclibc.org
2007-06-27 21:07 aldot at uclibc.org
2007-06-25 11:07 aldot at uclibc.org
2007-06-14 13:09 jacmet at uclibc.org
2007-06-02 13:13 aldot at uclibc.org
2007-05-15  9:34 aldot at uclibc.org
2007-05-07  4:07 sjhill at uclibc.org
2007-05-07  4:04 sjhill at uclibc.org
2007-04-25  7:11 jacmet at uclibc.org
2007-04-05  7:04 jacmet at uclibc.org
2007-03-24 12:09 aldot at uclibc.org
2007-03-23 13:26 aldot at uclibc.org
2007-03-23 13:24 aldot at uclibc.org
2007-03-20  9:51 aldot at uclibc.org
2007-03-20  8:53 aldot at uclibc.org
2007-03-15  8:36 jacmet at uclibc.org
2007-03-14 13:02 aldot at uclibc.org
2007-02-27  9:04 jacmet at uclibc.org
2007-02-23 11:55 jacmet at uclibc.org
2007-02-16 15:19 aldot at uclibc.org
2007-02-12 14:43 jacmet at uclibc.org
2007-02-06 16:34 jacmet at uclibc.org
2007-02-06 16:31 jacmet at uclibc.org
2007-02-06 16:23 jacmet at uclibc.org
2007-02-06 16:20 jacmet at uclibc.org
2007-02-06 16:18 jacmet at uclibc.org
2007-02-02 16:15 aldot at uclibc.org
2007-02-01 12:30 aldot at uclibc.org
2007-01-31 14:21 aldot at uclibc.org
2007-01-30 16:47 jacmet at uclibc.org
2007-01-30 13:37 jacmet at uclibc.org
2007-01-30 13:36 jacmet at uclibc.org
2006-12-13  6:58 andersen at uclibc.org
2006-12-13  6:18 andersen at uclibc.org
2006-12-07 16:31 aldot at uclibc.org
2006-12-02 19:36 aldot at uclibc.org
2006-12-02 18:36 aldot at uclibc.org
2006-12-02 17:03 aldot at uclibc.org
2006-11-17 12:57 aldot at uclibc.org
2006-11-17 11:37 aldot at uclibc.org
2006-10-25  8:10 jacmet at uclibc.org
2006-08-29 16:45 aldot at uclibc.org
2006-08-24 19:48 aldot at uclibc.org
2006-07-31  9:01 jacmet

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080706135556.9B3C03C650@busybox.net \
    --to=jacmet@uclibc.org \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.