81c40b39c

Rob Landley

2006-04-10

SOURCE BUG Duration: 14s

Subject

Patch from Tito to unify deluser and delgroup, and generally shrink code.

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/applets.h +4 -4 loginutils/Makefile.in +3 -1 loginutils/delgroup.c +0 -62 loginutils/delline.c +0 -113 loginutils/deluser.c +69 -37

include/applets.h+4 -4

@@ -82,7 +82,7 @@ USE_DATE(APPLET(date, date_main, _BB_DIR_BIN, _BB_SUID_NEVER))
	USE_DC(APPLET(dc, dc_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
	USE_DD(APPLET(dd, dd_main, _BB_DIR_BIN, _BB_SUID_NEVER))
	USE_DEALLOCVT(APPLET(deallocvt, deallocvt_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
-	USE_DELGROUP(APPLET(delgroup, delgroup_main, _BB_DIR_BIN, _BB_SUID_NEVER))
+	USE_DELGROUP(APPLET(delgroup, deluser_main, _BB_DIR_BIN, _BB_SUID_NEVER))
	USE_DELUSER(APPLET(deluser, deluser_main, _BB_DIR_BIN, _BB_SUID_NEVER))
	USE_DEVFSD(APPLET(devfsd, devfsd_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
	USE_DF(APPLET(df, df_main, _BB_DIR_BIN, _BB_SUID_NEVER))
@@ -95,7 +95,7 @@ USE_DPKG(APPLET(dpkg, dpkg_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
	USE_DPKG_DEB(APPLET_ODDNAME(dpkg-deb, dpkg_deb_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER, dpkg_deb))
	USE_DU(APPLET(du, du_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
	USE_DUMPKMAP(APPLET(dumpkmap, dumpkmap_main, _BB_DIR_BIN, _BB_SUID_NEVER))
-	USE_DUMPLEASES(APPLET(dumpleases, dumpleases_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+	//USE_DUMPLEASES(APPLET(dumpleases, dumpleases_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
	USE_E2FSCK(APPLET(e2fsck, e2fsck_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
	USE_E2LABEL(APPLET_NOUSAGE(e2label, tune2fs_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
	USE_ECHO(APPLET(echo, echo_main, _BB_DIR_BIN, _BB_SUID_NEVER))
@@ -273,8 +273,8 @@ USE_TRACEROUTE(APPLET(traceroute, traceroute_main, _BB_DIR_USR_BIN, _BB_SUID_MAY
	USE_TRUE(APPLET(true, true_main, _BB_DIR_BIN, _BB_SUID_NEVER))
	USE_TTY(APPLET(tty, tty_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
	USE_TUNE2FS(APPLET(tune2fs, tune2fs_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
-	USE_UDHCPC(APPLET(udhcpc, udhcpc_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
-	USE_UDHCPD(APPLET(udhcpd, udhcpd_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
+	//USE_UDHCPC(APPLET(udhcpc, udhcpc_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
+	//USE_UDHCPD(APPLET(udhcpd, udhcpd_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
	USE_UMOUNT(APPLET(umount, umount_main, _BB_DIR_BIN, _BB_SUID_NEVER))
	USE_UNAME(APPLET(uname, uname_main, _BB_DIR_BIN, _BB_SUID_NEVER))
	USE_UNCOMPRESS(APPLET(uncompress, uncompress_main, _BB_DIR_BIN, _BB_SUID_NEVER))

loginutils/Makefile.in+3 -1

@@ -20,7 +20,9 @@ LOGINUTILS-$(CONFIG_SU) += su.o
	LOGINUTILS-$(CONFIG_SULOGIN) += sulogin.o
	LOGINUTILS-$(CONFIG_VLOCK) += vlock.o
	LOGINUTILS-$(CONFIG_DELUSER) += deluser.o
-	LOGINUTILS-$(CONFIG_DELGROUP) += delgroup.o
+	LOGINUTILS-$(CONFIG_DELGROUP) += deluser.o
+
+	LOGINUTILS-y:=$(sort $(LOGINUTILS-y))

	ifneq ($(strip $(LOGINUTILS-y)),)
	libraries-y+=$(LOGINUTILS_DIR)$(LOGINUTILS_AR)

loginutils/delgroup.c+0 -62

@@ -1,62 +0,0 @@
-	/* vi: set sw=4 ts=4: */
-	/*
-	* deluser (remove lusers from the system ;) for TinyLogin
-	*
-	* Copyright (C) 1999 by Lineo, inc. and John Beppu
-	* Copyright (C) 1999,2000,2001 by John Beppu <[email protected]>
-	*
-	* 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
-	*
-	*/
-
-	#include <sys/stat.h>
-	#include <unistd.h>
-	#include <stdio.h>
-	#include <stdlib.h>
-	#include <string.h>
-	#include "busybox.h"
-
-
-	#if ! defined CONFIG_DELUSER
-	#include "delline.c"
-	#else
-	extern int del_line_matching(const char login, const char filename);
-	#endif
-
-	int delgroup_main(int argc, char **argv)
-	{
-	/* int successful; */
-	int failure;
-
-	if (argc != 2) {
-	bb_show_usage();
-	} else {
-
-	failure = del_line_matching(argv[1], bb_path_group_file);
-	#ifdef CONFIG_FEATURE_SHADOWPASSWDS
-	if (access(bb_path_gshadow_file, W_OK) == 0) {
-	/* EDR the \|= works if the error is not 0, so he had it wrong */
-	failure \|= del_line_matching(argv[1], bb_path_gshadow_file);
-	}
-	#endif
-	if (failure) {
-	bb_error_msg_and_die("%s: Group could not be removed\n", argv[1]);
-	}
-
-	}
-	return (EXIT_SUCCESS);
-	}
-
-	/* $Id: delgroup.c,v 1.2 2003/07/14 21:50:51 andersen Exp $ */

loginutils/delline.c+0 -113

@@ -1,113 +0,0 @@
-	/* vi: set sw=4 ts=4: */
-	/*
-	* deluser (remove lusers from the system ;) for TinyLogin
-	*
-	* Copyright (C) 1999 by Lineo, inc. and John Beppu
-	* Copyright (C) 1999,2000,2001 by John Beppu <[email protected]>
-	*
-	* 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
-	*
-	*/
-
-	#include <sys/stat.h>
-	#include <unistd.h>
-	#include <stdio.h>
-	#include <stdlib.h>
-	#include <string.h>
-	#include "busybox.h"
-
-
-
-	/* where to start and stop deletion */
-	typedef struct {
-	size_t start;
-	size_t stop;
-	} Bounds;
-
-	/* An interesting side-effect of boundary()'s
-	* implementation is that the first user (typically root)
-	* cannot be removed. Let's call it a feature. */
-	static inline Bounds boundary(const char buffer, const char login)
-	{
-	char needle[256];
-	char *start;
-	char *stop;
-	Bounds b;
-
-	snprintf(needle, 256, "\n%s:", login);
-	needle[255] = 0;
-	start = strstr(buffer, needle);
-	if (!start) {
-	b.start = 0;
-	b.stop = 0;
-	return b;
-	}
-	start++;
-
-	stop = index(start, '\n'); /* index is a BSD-ism */
-	b.start = start - buffer;
-	b.stop = stop - buffer;
-	return b;
-	}
-
-	/* grep -v ^login (except it only deletes the first match) */
-	/* ...in fact, I think I'm going to simplify this later */
-	int del_line_matching(const char login, const char filename)
-	{
-	char *buffer;
-	FILE *passwd;
-	size_t len;
-	Bounds b;
-	struct stat statbuf;
-
-	/* load into buffer */
-	passwd = fopen(filename, "r");
-	if (!passwd) {
-	return 1;
-	}
-	stat(filename, &statbuf);
-	len = statbuf.st_size;
-	buffer = (char ) malloc(len sizeof(char));
-
-	if (!buffer) {
-	fclose(passwd);
-	return 1;
-	}
-	fread(buffer, len, sizeof(char), passwd);
-
-	fclose(passwd);
-
-	/* find the user to remove */
-	b = boundary(buffer, login);
-	if (b.stop == 0) {
-	free(buffer);
-	return 1;
-	}
-
-	/* write the file w/o the user */
-	passwd = fopen(filename, "w");
-	if (!passwd) {
-	return 1;
-	}
-	fwrite(buffer, (b.start - 1), sizeof(char), passwd);
-	fwrite(&buffer[b.stop], (len - b.stop), sizeof(char), passwd);
-
-	fclose(passwd);
-
-	return 0;
-	}
-
-
-	/* $Id: delline.c,v 1.2 2003/07/14 21:50:51 andersen Exp $ */

loginutils/deluser.c+69 -37

@@ -4,20 +4,9 @@
	*
	* Copyright (C) 1999 by Lineo, inc. and John Beppu
	* Copyright (C) 1999,2000,2001 by John Beppu <[email protected]>
+	* Unified with delgroup by Tito Ragusa <[email protected]>
	*
-	* 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.
	*
	*/

@@ -28,39 +17,82 @@
	#include <string.h>
	#include "busybox.h"

+	/* where to start and stop deletion */
+	typedef struct {
+	size_t start;
+	size_t stop;
+	} Bounds;

-	#include "delline.c"
+	/* An interesting side-effect of boundary()'s
+	* implementation is that the first user (typically root)
+	* cannot be removed. Let's call it a feature. */
+	static inline Bounds boundary(const char buffer, const char login)
+	{
+	char needle[256];
+	char *start;
+	char *stop;
+	Bounds b;

-	static const char deluser_format[]="%s: User could not be removed from %s";
+	snprintf(needle, 256, "\n%s:", login);
+	needle[255] = 0;
+	start = strstr(buffer, needle);
+	if (!start) {
+	b.start = 0;
+	b.stop = 0;
+	return b;
+	}
+	start++;

-	int deluser_main(int argc, char **argv)
+	stop = index(start, '\n'); /* index is a BSD-ism */
+	b.start = start - buffer;
+	b.stop = stop - buffer;
+	return b;
+	}
+
+	/* grep -v ^login (except it only deletes the first match) */
+	/* ...in fact, I think I'm going to simplify this later */
+	static void del_line_matching(const char login, const char filename)
	{
-	/* int successful; */
-	int failure;
+	char *buffer;
+	FILE *passwd;
+	Bounds b;
+	struct stat statbuf;
+

+	if ((passwd = bb_wfopen(filename, "r"))) {
+	xstat(filename, &statbuf);
+	buffer = (char ) xmalloc(statbuf.st_size sizeof(char));
+	fread(buffer, statbuf.st_size, sizeof(char), passwd);
+	fclose(passwd);
+	/* find the user to remove */
+	b = boundary(buffer, login);
+	if (b.stop != 0) {
+	/* write the file w/o the user */
+	if ((passwd = bb_wfopen(filename, "w"))) {
+	fwrite(buffer, (b.start - 1), sizeof(char), passwd);
+	fwrite(&buffer[b.stop], (statbuf.st_size - b.stop), sizeof(char), passwd);
+	fclose(passwd);
+	}
+	} else {
+	bb_error_msg("Can't find '%s' in '%s'", login, filename);
+	}
+	free(buffer);
+	}
+	}
+
+	int deluser_main(int argc, char **argv)
+	{
	if (argc != 2) {
	bb_show_usage();
	} else {
-
-	failure = del_line_matching(argv[1], bb_path_passwd_file);
-	if (failure) {
-	bb_error_msg_and_die(deluser_format, argv[1], bb_path_passwd_file);
+	if (ENABLE_DELUSER && bb_applet_name[3] == 'u') {
+	del_line_matching(argv[1], bb_path_passwd_file);
+	if (ENABLE_FEATURE_SHADOWPASSWDS)
+	del_line_matching(argv[1], bb_path_shadow_file);
	}
-	#ifdef CONFIG_FEATURE_SHADOWPASSWDS
-	failure = del_line_matching(argv[1], bb_path_shadow_file);
-	if (failure) {
-	bb_error_msg_and_die(deluser_format, argv[1], bb_path_shadow_file);
-	}
-	failure = del_line_matching(argv[1], bb_path_gshadow_file);
-	if (failure) {
-	bb_error_msg_and_die(deluser_format, argv[1], bb_path_gshadow_file);
-	}
-	#endif
-	failure = del_line_matching(argv[1], bb_path_group_file);
-	if (failure) {
-	bb_error_msg_and_die(deluser_format, argv[1], bb_path_group_file);
-	}
-
+	del_line_matching(argv[1], bb_path_group_file);
+	if (ENABLE_FEATURE_SHADOWPASSWDS)
+	del_line_matching(argv[1], bb_path_gshadow_file);
	}
	return (EXIT_SUCCESS);
	}