23f62fc6f

"Vladimir N. Oleynik"

2005-09-14

SOURCE BUG Duration: 6s

Subject

split libbb: moved xregcomp separatelly for speed up recompile

SOURCE BUG

This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)

→ Bu hatanin tam hikayesini ve duzeltme diffini gor

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

editors/awk.c +1 -1 editors/sed.c +1 -1 findutils/grep.c +1 -1 include/libbb.h +0 -2 include/xregex.h +31 -0 libbb/xregcomp.c +1 -1 miscutils/devfsd.c +1 -2

editors/awk.c+1 -1

@@ -29,8 +29,8 @@
	#include <math.h>
	#include <ctype.h>
	#include <getopt.h>
-	#include <regex.h>

+	#include "xregex.h"
	#include "busybox.h"

editors/sed.c+1 -1

@@ -79,12 +79,12 @@

	#include <stdio.h>
	#include <unistd.h> /* for getopt() */
-	#include <regex.h>
	#include <string.h> /* for strdup() */
	#include <errno.h>
	#include <ctype.h> /* for isspace() */
	#include <stdlib.h>
	#include "busybox.h"
+	#include "xregex.h"

	typedef struct sed_cmd_s {
	/* Ordered by alignment requirements: currently 36 bytes on x86 */

findutils/grep.c+1 -1

@@ -27,10 +27,10 @@
	#include <stdio.h>
	#include <stdlib.h>
	#include <getopt.h>
-	#include <regex.h>
	#include <string.h>
	#include <errno.h>
	#include "busybox.h"
+	#include "xregex.h"


	/* options */

include/libbb.h+0 -2

@@ -29,7 +29,6 @@
	#include <stdarg.h>
	#include <sys/stat.h>
	#include <sys/types.h>
-	#include <regex.h>
	#include <termios.h>
	#include <stdint.h>

@@ -476,7 +475,6 @@ extern void vfork_daemon_rexec(int nochdir, int noclose,
	int argc, char *argv, char foreground_opt);
	extern int get_terminal_width_height(int fd, int width, int height);
	extern unsigned long get_ug_id(const char s, long (my_getxxnam)(const char *));
-	extern void xregcomp(regex_t preg, const char regex, int cflags);

	#define HASH_SHA1 1
	#define HASH_MD5 2

include/xregex.h+31 -0

@@ -0,0 +1,31 @@
+	/* vi: set sw=4 ts=4: */
+	/*
+	* Busybox xregcomp utility routine
+	*
+	*
+	* 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
+	*
+	* Based in part on code from sash, Copyright (c) 1999 by David I. Bell
+	* Permission has been granted to redistribute this code under the GPL.
+	*
+	*/
+	#ifndef __BB_REGEX__
+	#define __BB_REGEX__
+
+	#include <sys/types.h>
+	#include <regex.h>
+	extern void xregcomp(regex_t preg, const char regex, int cflags);
+
+	#endif

libbb/xregcomp.c+1 -1

@@ -23,7 +23,7 @@

	#include <stdio.h>
	#include "libbb.h"
-	#include <regex.h>
+	#include "xregex.h"

miscutils/devfsd.c+1 -2

@@ -49,8 +49,8 @@
	Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia.
	*/

-	#include "libbb.h"
	#include "busybox.h"
+	#include "xregex.h"
	#include <unistd.h>
	#include <stdio.h>
	#include <stdlib.h>
@@ -68,7 +68,6 @@
	#include <fcntl.h>
	#include <syslog.h>
	#include <signal.h>
-	#include <regex.h>
	#include <errno.h>
	#include <sys/sysmacros.h>