c418d482b

Bernhard Reutner-Fischer

2006-05-31

SOURCE BUG Duration: 37s

Subject

- s/defined(__uClinux__)/BB_NOMMU/ This needs a second pass to: + add bb_daemon(unsigned char no_chdir, unsigned char no_close, const char*flag) + eventually globally export argc and argv, so we don't need to pass it to bb_daemon().

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 →

include/libbb.h +1 -1 libbb/vfork_daemon_rexec.c +2 -2 miscutils/crond.c +3 -3 networking/dnsd.c +4 -4 networking/inetd.c +3 -3 sysklogd/klogd.c +3 -3 sysklogd/syslogd.c +3 -3

include/libbb.h+1 -1

@@ -492,7 +492,7 @@ extern int my_query_module(const char name, int which, void buf, size_t bufs
	extern void print_login_issue(const char issue_file, const char tty);
	extern void print_login_prompt(void);

-	#if defined(__uClinux__)
+	#ifdef BB_NOMMU
	extern void vfork_daemon_rexec(int nochdir, int noclose,
	int argc, char *argv, char foreground_opt);
	#endif

libbb/vfork_daemon_rexec.c+2 -2

@@ -22,7 +22,7 @@
	#include "libbb.h"


-	#if defined(__uClinux__)
+	#ifdef BB_NOMMU
	void vfork_daemon_rexec(int nochdir, int noclose,
	int argc, char *argv, char foreground_opt)
	{
@@ -64,4 +64,4 @@ void vfork_daemon_rexec(int nochdir, int noclose,
	exit(0);
	}
	}
-	#endif /* uClinux */
+	#endif /* BB_NOMMU */

miscutils/crond.c+3 -3

@@ -205,12 +205,12 @@ int crond_main(int ac, char **av)
	*/

	if (!(opt & 4)) {
-	#if defined(__uClinux__)
+	#ifdef BB_NOMMU
	/* reexec for vfork() do continue parent */
	vfork_daemon_rexec(1, 0, ac, av, "-f");
-	#else /* uClinux */
+	#else
	bb_xdaemon(1, 0);
-	#endif /* uClinux */
+	#endif
	}

	(void) startlogger(); /* need if syslog mode selected */

networking/dnsd.c+4 -4

@@ -92,7 +92,7 @@ static void convname(char a, uint8_t q)
	}

	/*
-	* Insert length of substrings insetad of dots
+	* Insert length of substrings instead of dots
	*/
	static void undot(uint8_t * rip)
	{
@@ -393,12 +393,12 @@ int dnsd_main(int argc, char **argv)
	}

	if(is_daemon())
-	#if defined(__uClinux__)
+	#ifdef BB_NOMMU
	/* reexec for vfork() do continue parent */
	vfork_daemon_rexec(1, 0, argc, argv, "-d");
-	#else /* uClinux */
+	#else
	bb_xdaemon(1, 0);
-	#endif /* uClinuvx */
+	#endif

	dnsentryinit(is_verbose());

networking/inetd.c+3 -3

@@ -1309,12 +1309,12 @@ inetd_main (int argc, char *argv[])
	bb_error_msg_and_die ("non-root must specify a config file");

	if (!(opt & 2)) {
-	#if defined(__uClinux__)
+	#ifdef BB_NOMMU
	/* reexec for vfork() do continue parent */
	vfork_daemon_rexec (0, 0, argc, argv, "-f");
	#else
-	daemon (0, 0); /* bb_xdaemon? */
-	#endif /* uClinux */
+	bb_xdaemon (0, 0);
+	#endif
	} else {
	setsid ();
	}

sysklogd/klogd.c+3 -3

@@ -118,11 +118,11 @@ int klogd_main(int argc, char **argv)
	}

	if (!(opt & OPT_FOREGROUND)) {
-	#if defined(__uClinux__)
+	#ifdef BB_NOMMU
	vfork_daemon_rexec(0, 1, argc, argv, "-n");
-	#else /* __uClinux__ */
+	#else
	bb_xdaemon(0, 1);
-	#endif /* __uClinux__ */
+	#endif
	}
	doKlogd(console_log_level);

sysklogd/syslogd.c+3 -3

@@ -670,11 +670,11 @@ int syslogd_main(int argc, char **argv)
	umask(0);

	if (doFork == TRUE) {
-	#if defined(__uClinux__)
+	#ifdef BB_NOMMU
	vfork_daemon_rexec(0, 1, argc, argv, "-n");
-	#else /* __uClinux__ */
+	#else
	bb_xdaemon(0, 1);
-	#endif /* __uClinux__ */
+	#endif
	}
	doSyslogd();