Compare commits

...
10 Commits
Author SHA1 Message Date
Bernhard Reutner-Fischer e203ea59c7 - don't look at the address but rather on the value.
(r14748 from trunk)
2006-04-10 20:37:29 +00:00
Bernhard Reutner-Fischer addf86e3d3 - stable version 1.1.2 2006-04-10 20:17:34 +00:00
Rob Landley 8dc83c654d Bring this up to date with busybox-1.1.1.fixes.patch by importing
svn 14653, 14684, 14746, and 14749.
2006-04-05 03:10:42 +00:00
Bernhard Reutner-Fischer 7fe9dd5dd7 - fix one-argument mount in cases where fstab or mtab contain overlapping
entries.  (Such as "mount -o remount,rw /" where you're not on rootfs.).
  (r14723 from trunk)
2006-04-04 08:23:59 +00:00
Bernhard Reutner-Fischer 5e89953273 - make sure that we see all lib*/.c in IMA-mode even when not building the .so
(r14740 from trunk).
2006-04-04 08:21:36 +00:00
Paul Fox efbadf9f3f prevent find from ever descending into an xdev'ed directory.
(brought over from trunk r14665)
2006-03-30 20:06:46 +00:00
Bernhard Reutner-Fischer 2ebc69a4c6 - pull r14681 from trunk:
don't free foreign mem.
2006-03-30 13:03:28 +00:00
Bernhard Reutner-Fischer 59970faa39 - pull r14643 from trunk:
make sure that we see freeramdisk only once
2006-03-30 12:56:26 +00:00
Bernhard Reutner-Fischer fe802ee02c - pull r14628 from trunk:
Bug spotted by Stephane Billiart: losetup depends on loop.c.
2006-03-30 12:55:12 +00:00
Bernhard Reutner-Fischer 7ff69e3ab8 - upcoming stable version 1.1.2 2006-03-30 12:52:37 +00:00
5 changed files with 15 additions and 27 deletions

No files matched your search

+1 -1
View File
@@ -258,6 +258,7 @@ LIBBUSYBOX_SONAME:=$(LD_LIBBUSYBOX).$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL
DO_INSTALL_LIBS:=$(LD_LIBBUSYBOX) \
$(LD_LIBBUSYBOX).$(MAJOR_VERSION) \
$(LD_LIBBUSYBOX).$(MAJOR_VERSION).$(MINOR_VERSION)
endif # CONFIG_BUILD_LIBBUSYBOX
ifeq ($(strip $(CONFIG_BUILD_AT_ONCE)),y)
ifneq ($(strip $(CONFIG_FEATURE_SHARED_BUSYBOX)),y)
@@ -269,7 +270,6 @@ $(LIBBUSYBOX_SONAME): $(LIBRARY_SRC)
else # CONFIG_BUILD_AT_ONCE
$(LIBBUSYBOX_SONAME): $(libbusybox-obj)
endif # CONFIG_BUILD_AT_ONCE
endif # CONFIG_BUILD_LIBBUSYBOX
ifeq ($(strip $(CONFIG_FEATURE_SHARED_BUSYBOX)),y)
LDBUSYBOX:=-L$(top_builddir) -lbusybox
+1 -1
View File
@@ -14,7 +14,7 @@ endif
PROG := busybox
MAJOR_VERSION :=1
MINOR_VERSION :=1
SUBLEVEL_VERSION:=1
SUBLEVEL_VERSION:=2
EXTRAVERSION :=
VERSION :=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL_VERSION)$(EXTRAVERSION)
BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
+4 -18
View File
@@ -4,21 +4,7 @@
*
* Copyright (C) 2005 by Robert Sullivan <cogito.ergo.cogito@gmail.com>
*
* 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>
@@ -75,16 +61,16 @@ static void cmp_files(char **infiles)
fgets(thisline[i], LINE_LEN, streams[i]);
}
while (thisline[0] || thisline[1]) {
while (*thisline[0] || *thisline[1]) {
int order = 0;
i = 0;
if (feof(streams[0])) i |= BB_EOF_0;
if (feof(streams[1])) i |= BB_EOF_1;
if (!thisline[0])
if (!*thisline[0])
order = 1;
else if (!thisline[1])
else if (!*thisline[1])
order = -1;
else {
int tl0_len, tl1_len;
+2 -2
View File
@@ -681,9 +681,9 @@ static enum obj_reloc arch_apply_relocation (struct obj_file *f,
ElfW(RelM) *rel, ElfW(Addr) value);
static void arch_create_got (struct obj_file *f);
#if ENABLE_FEATURE_CHECK_TAINTED_MODULE
static int obj_gpl_license(struct obj_file *f, const char **license);
#endif /* ENABLE_FEATURE_CHECK_TAINTED_MODULE */
#endif /* obj.h */
//----------------------------------------------------------------------------
//--------end of modutils obj.h
+7 -5
View File
@@ -284,6 +284,7 @@ static int singlemount(struct mntent *mp)
return 1;
} else {
// Strangely enough, nfsmount() doesn't actually mount() anything.
mp->mnt_type = "nfs";
rc = mount_it_now(mp, vfsflags, filteropts);
if (ENABLE_FEATURE_CLEAN_UP) free(filteropts);
@@ -291,11 +292,11 @@ static int singlemount(struct mntent *mp)
}
}
// Look at the file. (Not found isn't a failure for remount.)
// Look at the file. (Not found isn't a failure for remount, or for
// a synthetic filesystem like proc or sysfs.)
if (lstat(mp->mnt_fsname, &st));
if (!(vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE))) {
else if (!(vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE))) {
// Do we need to allocate a loopback device for it?
if (ENABLE_FEATURE_MOUNT_LOOP && S_ISREG(st.st_mode)) {
@@ -475,8 +476,9 @@ int mount_main(int argc, char **argv)
// Get next fstab entry
if (!getmntent_r(fstab, mtcur, bb_common_bufsiz1,
sizeof(bb_common_bufsiz1)))
if (!getmntent_r(fstab, mtcur, bb_common_bufsiz1
+ (mtcur==mtpair ? sizeof(bb_common_bufsiz1)/2 : 0),
sizeof(bb_common_bufsiz1)/2))
{
// Were we looking for something specific?