svn commit: trunk/busybox: archival include libbb networking

aldot at busybox.net aldot at busybox.net
Mon Apr 3 16:39:33 UTC 2006


Author: aldot
Date: 2006-04-03 09:39:31 -0700 (Mon, 03 Apr 2006)
New Revision: 14739

Log:
- move buffer allocation schemes to libbb.h
- include the correct headers: applets need busybox.h while lib* need libbb.h


Modified:
   trunk/busybox/archival/uncompress.c
   trunk/busybox/include/busybox.h
   trunk/busybox/include/libbb.h
   trunk/busybox/libbb/bb_do_delay.c
   trunk/busybox/libbb/bb_echo.c
   trunk/busybox/libbb/compare_string_array.c
   trunk/busybox/libbb/copy_file.c
   trunk/busybox/libbb/copyfd.c
   trunk/busybox/libbb/get_last_path_component.c
   trunk/busybox/libbb/get_terminal_width_height.c
   trunk/busybox/libbb/md5.c
   trunk/busybox/libbb/messages.c
   trunk/busybox/libbb/mode_string.c
   trunk/busybox/libbb/sha1.c
   trunk/busybox/libbb/u_signal_names.c
   trunk/busybox/libbb/xgetlarg.c
   trunk/busybox/networking/dnsd.c
   trunk/busybox/networking/ifupdown.c


Changeset:
Modified: trunk/busybox/archival/uncompress.c
===================================================================
--- trunk/busybox/archival/uncompress.c	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/archival/uncompress.c	2006-04-03 16:39:31 UTC (rev 14739)
@@ -2,19 +2,7 @@
 /*
  *	Uncompress applet for busybox (c) 2002 Glenn McGrath
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stdlib.h>
@@ -24,7 +12,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "libbb.h"
+#include "busybox.h"
 #include "unarchive.h"
 
 #define GUNZIP_TO_STDOUT	1

Modified: trunk/busybox/include/busybox.h
===================================================================
--- trunk/busybox/include/busybox.h	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/include/busybox.h	2006-04-03 16:39:31 UTC (rev 14739)
@@ -62,23 +62,6 @@
 #include "applets.h"
 #undef PROTOTYPES
 
-#ifdef CONFIG_FEATURE_BUFFERS_GO_ON_STACK
-#define RESERVE_CONFIG_BUFFER(buffer,len)           char buffer[len]
-#define RESERVE_CONFIG_UBUFFER(buffer,len) unsigned char buffer[len]
-#define RELEASE_CONFIG_BUFFER(buffer)      ((void)0)
-#else
-#ifdef CONFIG_FEATURE_BUFFERS_GO_IN_BSS
-#define RESERVE_CONFIG_BUFFER(buffer,len)  static          char buffer[len]
-#define RESERVE_CONFIG_UBUFFER(buffer,len) static unsigned char buffer[len]
-#define RELEASE_CONFIG_BUFFER(buffer)      ((void)0)
-#else
-#define RESERVE_CONFIG_BUFFER(buffer,len)           char *buffer=xmalloc(len)
-#define RESERVE_CONFIG_UBUFFER(buffer,len) unsigned char *buffer=xmalloc(len)
-#define RELEASE_CONFIG_BUFFER(buffer)      free (buffer)
-#endif
-#endif
-
-
 #ifndef RB_POWER_OFF
 /* Stop system and switch power off if possible.  */
 #define RB_POWER_OFF   0x4321fedc

Modified: trunk/busybox/include/libbb.h
===================================================================
--- trunk/busybox/include/libbb.h	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/include/libbb.h	2006-04-03 16:39:31 UTC (rev 14739)
@@ -59,6 +59,24 @@
 #define	MAX(a,b) (((a)>(b))?(a):(b))
 #endif
 
+/* buffer allocation schemes */
+#ifdef CONFIG_FEATURE_BUFFERS_GO_ON_STACK
+#define RESERVE_CONFIG_BUFFER(buffer,len)           char buffer[len]
+#define RESERVE_CONFIG_UBUFFER(buffer,len) unsigned char buffer[len]
+#define RELEASE_CONFIG_BUFFER(buffer)      ((void)0)
+#else
+#ifdef CONFIG_FEATURE_BUFFERS_GO_IN_BSS
+#define RESERVE_CONFIG_BUFFER(buffer,len)  static          char buffer[len]
+#define RESERVE_CONFIG_UBUFFER(buffer,len) static unsigned char buffer[len]
+#define RELEASE_CONFIG_BUFFER(buffer)      ((void)0)
+#else
+#define RESERVE_CONFIG_BUFFER(buffer,len)           char *buffer=xmalloc(len)
+#define RESERVE_CONFIG_UBUFFER(buffer,len) unsigned char *buffer=xmalloc(len)
+#define RELEASE_CONFIG_BUFFER(buffer)      free (buffer)
+#endif
+#endif
+
+
 extern void bb_show_usage(void) ATTRIBUTE_NORETURN ATTRIBUTE_EXTERNALLY_VISIBLE;
 extern void bb_error_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
 extern void bb_error_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));

Modified: trunk/busybox/libbb/bb_do_delay.c
===================================================================
--- trunk/busybox/libbb/bb_do_delay.c	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/libbb/bb_do_delay.c	2006-04-03 16:39:31 UTC (rev 14739)
@@ -9,6 +9,7 @@
 
 #include <time.h>
 #include <unistd.h>
+#include "libbb.h"
 
 void bb_do_delay(int seconds)
 {

Modified: trunk/busybox/libbb/bb_echo.c
===================================================================
--- trunk/busybox/libbb/bb_echo.c	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/libbb/bb_echo.c	2006-04-03 16:39:31 UTC (rev 14739)
@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "busybox.h"
+#include "libbb.h"
 
 int bb_echo(int ATTRIBUTE_UNUSED argc, char **argv)
 {

Modified: trunk/busybox/libbb/compare_string_array.c
===================================================================
--- trunk/busybox/libbb/compare_string_array.c	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/libbb/compare_string_array.c	2006-04-03 16:39:31 UTC (rev 14739)
@@ -1,20 +1,10 @@
+/* vi:set ts=4:*/
 /*
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <string.h>
+#include "libbb.h"
 
 /* returns the array number of the string */
 int compare_string_array(const char * const string_array[], const char *key)

Modified: trunk/busybox/libbb/copy_file.c
===================================================================
--- trunk/busybox/libbb/copy_file.c	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/libbb/copy_file.c	2006-04-03 16:39:31 UTC (rev 14739)
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* Compiler version-specific crap that should be in a header file somewhere. */
 

Modified: trunk/busybox/libbb/copyfd.c
===================================================================
--- trunk/busybox/libbb/copyfd.c	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/libbb/copyfd.c	2006-04-03 16:39:31 UTC (rev 14739)
@@ -12,7 +12,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "busybox.h"
 #include "libbb.h"
 
 

Modified: trunk/busybox/libbb/get_last_path_component.c
===================================================================
--- trunk/busybox/libbb/get_last_path_component.c	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/libbb/get_last_path_component.c	2006-04-03 16:39:31 UTC (rev 14739)
@@ -7,6 +7,8 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
+#include "libbb.h"
+
 char *bb_get_last_path_component(char *path)
 {
 	char *first = path;

Modified: trunk/busybox/libbb/get_terminal_width_height.c
===================================================================
--- trunk/busybox/libbb/get_terminal_width_height.c	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/libbb/get_terminal_width_height.c	2006-04-03 16:39:31 UTC (rev 14739)
@@ -4,19 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen at codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stdio.h>
@@ -26,7 +14,7 @@
 #include <unistd.h>
 #include <termios.h>
 #include <sys/ioctl.h>
-#include "busybox.h"
+#include "libbb.h"
 
 /* It is perfectly ok to pass in a NULL for either width or for
  * height, in which case that value will not be set.  */

Modified: trunk/busybox/libbb/md5.c
===================================================================
--- trunk/busybox/libbb/md5.c	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/libbb/md5.c	2006-04-03 16:39:31 UTC (rev 14739)
@@ -1,9 +1,9 @@
 /*
  *  md5.c - Compute MD5 checksum of strings according to the
  *          definition of MD5 in RFC 1321 from April 1992.
- * 
+ *
  *  Written by Ulrich Drepper <drepper at gnu.ai.mit.edu>, 1995.
- *  
+ *
  *  Copyright (C) 1995-1999 Free Software Foundation, Inc.
  *  Copyright (C) 2001 Manuel Novoa III
  *  Copyright (C) 2003 Glenn L. McGrath
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "busybox.h"
+#include "libbb.h"
 
 # if CONFIG_MD5_SIZE_VS_SPEED < 0 || CONFIG_MD5_SIZE_VS_SPEED > 3
 # define MD5_SIZE_VS_SPEED 2
@@ -71,7 +71,7 @@
  * starting at BUFFER.
  * It is necessary that LEN is a multiple of 64!!!
  */
-void md5_hash_block(const void *buffer, size_t len, md5_ctx_t *ctx)
+static void md5_hash_block(const void *buffer, size_t len, md5_ctx_t *ctx)
 {
 	uint32_t correct_words[16];
 	const uint32_t *words = buffer;

Modified: trunk/busybox/libbb/messages.c
===================================================================
--- trunk/busybox/libbb/messages.c	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/libbb/messages.c	2006-04-03 16:39:31 UTC (rev 14739)
@@ -2,20 +2,8 @@
 /*
  * Copyright (C) 1999-2004 by Erik Andersen <andersen at codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
  */
 
 #include "busybox.h"

Modified: trunk/busybox/libbb/mode_string.c
===================================================================
--- trunk/busybox/libbb/mode_string.c	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/libbb/mode_string.c	2006-04-03 16:39:31 UTC (rev 14739)
@@ -4,20 +4,8 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3 at codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
  */
 
 /* Aug 13, 2003
@@ -28,6 +16,8 @@
 #include <assert.h>
 #include <sys/stat.h>
 
+#include "libbb.h"
+
 #if ( S_ISUID != 04000 ) || ( S_ISGID != 02000 ) || ( S_ISVTX != 01000 ) \
  || ( S_IRUSR != 00400 ) || ( S_IWUSR != 00200 ) || ( S_IXUSR != 00100 ) \
  || ( S_IRGRP != 00040 ) || ( S_IWGRP != 00020 ) || ( S_IXGRP != 00010 ) \

Modified: trunk/busybox/libbb/sha1.c
===================================================================
--- trunk/busybox/libbb/sha1.c	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/libbb/sha1.c	2006-04-03 16:39:31 UTC (rev 14739)
@@ -45,7 +45,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "busybox.h"
+#include "libbb.h"
 
 # define SHA1_BLOCK_SIZE  64
 # define SHA1_DIGEST_SIZE 20

Modified: trunk/busybox/libbb/u_signal_names.c
===================================================================
--- trunk/busybox/libbb/u_signal_names.c	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/libbb/u_signal_names.c	2006-04-03 16:39:31 UTC (rev 14739)
@@ -5,20 +5,7 @@
  * Copyright (C) many different people.
  * If you wrote this, please acknowledge your work.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <signal.h>
@@ -27,6 +14,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include "libbb.h"
+
 struct signal_name {
 	const char *name;
 	int number;

Modified: trunk/busybox/libbb/xgetlarg.c
===================================================================
--- trunk/busybox/libbb/xgetlarg.c	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/libbb/xgetlarg.c	2006-04-03 16:39:31 UTC (rev 14739)
@@ -1,6 +1,8 @@
 /* vi: set sw=4 ts=4: */
 /*
  * Copyright (C) 2003-2004 Erik Andersen <andersen at codepoet.org>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 
@@ -11,7 +13,7 @@
 #include <assert.h>
 #include <ctype.h>
 
-#include "busybox.h"
+#include "libbb.h"
 
 long bb_xgetlarg(const char *arg, int base, long lower, long upper)
 {

Modified: trunk/busybox/networking/dnsd.c
===================================================================
--- trunk/busybox/networking/dnsd.c	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/networking/dnsd.c	2006-04-03 16:39:31 UTC (rev 14739)
@@ -21,7 +21,7 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <ctype.h>
-#include "libbb.h"
+#include "busybox.h"
 
 static char *fileconf = "/etc/dnsd.conf";
 #define LOCK_FILE       "/var/run/dnsd.lock"

Modified: trunk/busybox/networking/ifupdown.c
===================================================================
--- trunk/busybox/networking/ifupdown.c	2006-04-03 15:46:14 UTC (rev 14738)
+++ trunk/busybox/networking/ifupdown.c	2006-04-03 16:39:31 UTC (rev 14739)
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "libbb.h"
+#include "busybox.h"
 
 #define MAX_OPT_DEPTH 10
 #define EUNBALBRACK 10001




More information about the busybox-cvs mailing list