[PATCH] 01/13 e2fsprogs-1.39-WIP - upstream changes
Andreas Dilger <[email protected]> Wed, 2 Aug 2006 10:39:38 -0600
| Newsgroups | gmane.comp.file-systems.ext2.devel |
|---|---|
| Message-ID | <[email protected]> |
Patches in e2fsprogs Mercurial repository since 1.39 tag. This is only
supplied to give a point of reference against the other patches. All of
these changes are already in the upstream repository.
============================================================================
%patch
diff -r 7c019255c280 -r 8599954f924f .hgtags
--- a/.hgtags Mon May 29 11:47:25 2006 -0400
+++ b/.hgtags Wed Jun 28 11:29:56 2006 -0400
@@ -71,3 +71,4 @@ b3e5c52c10907a4488ded00fca596487643bddc4
b3e5c52c10907a4488ded00fca596487643bddc4 E2FSPROGS-1.39-WIP-1231
cc5d09c487b27487925fb34d8ccd50a19e801ec4 E2FSPROGS-1.39-WIP-0330
a89eec026fc32ca7da786fbe3f76d892b6badb23 E2FSPROGS-1.39-WIP-0409
+7c019255c28099336f7bba454b9307c4bdeb94a4 E2FSPROGS-1_39
diff -r 7c019255c280 -r 8599954f924f MCONFIG.in
--- a/MCONFIG.in Mon May 29 11:47:25 2006 -0400
+++ b/MCONFIG.in Wed Jun 28 11:29:56 2006 -0400
@@ -33,7 +33,7 @@ datadir = @datadir@
CC = @CC@
BUILD_CC = @BUILD_CC@
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEFS = -DLOCALEDIR=\"$(localedir)\" -DROOT_SYSCONFDIR=\"$(root_sysconfdir)\" @DEFS@
CFLAGS = @CFLAGS@
CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @CPPFLAGS@
INTL_FLAGS = @INTL_FLAGS@
diff -r 7c019255c280 -r 8599954f924f Makefile.in
--- a/Makefile.in Mon May 29 11:47:25 2006 -0400
+++ b/Makefile.in Wed Jun 28 11:29:56 2006 -0400
@@ -28,6 +28,9 @@ subs:
progs: subs all-progs-recursive
libs: subs all-libs-recursive
+
+rpm:
+ sh contrib/build-rpm
docs:
-@test -d doc && cd doc && $(MAKE) libext2fs.info
diff -r 7c019255c280 -r 8599954f924f contrib/build-rpm
--- a/contrib/build-rpm Mon May 29 11:47:25 2006 -0400
+++ b/contrib/build-rpm Wed Jun 28 11:29:56 2006 -0400
@@ -21,7 +21,8 @@ cp -sR `pwd`/$currdir $tmpdir/$builddir
# Remove any build files from the temporary tarball directory
[ -f $tmpdir/$builddir/Makefile ] && make -C $tmpdir/$builddir distclean
-(cd $tmpdir && tar czfh ${builddir}.tar.gz $builddir)
+EXCLUDE="--exclude .hg*"
+(cd $tmpdir && tar czfh ${builddir}.tar.gz $EXCLUDE $builddir)
[ "`rpmbuild --version 2> /dev/null`" ] && RPM=rpmbuild || RPM=rpm
$RPM --define "_sourcedir `pwd`/$tmpdir" -ba $currdir/e2fsprogs.spec || exit $?
diff -r 7c019255c280 -r 8599954f924f debugfs/debugfs.c
--- a/debugfs/debugfs.c Mon May 29 11:47:25 2006 -0400
+++ b/debugfs/debugfs.c Wed Jun 28 11:29:56 2006 -0400
@@ -443,9 +443,9 @@ static void dump_xattr_string(FILE *out,
for (i = 0; i < len; i++)
if (printable)
- fprintf(out, "%c", str[i]);
+ fprintf(out, "%c", (unsigned char)str[i]);
else
- fprintf(out, "%02x ", str[i]);
+ fprintf(out, "%02x ", (unsigned char)str[i]);
}
static void internal_dump_inode_extra(FILE *out, const char *prefix,
diff -r 7c019255c280 -r 8599954f924f e2fsck/e2fsck.h
--- a/e2fsck/e2fsck.h Mon May 29 11:47:25 2006 -0400
+++ b/e2fsck/e2fsck.h Wed Jun 28 11:29:56 2006 -0400
@@ -5,6 +5,9 @@
* redistributed under the terms of the GNU Public License.
*
*/
+
+#ifndef _E2FSCK_H
+#define _E2FSCK_H
#include <stdio.h>
#include <string.h>
@@ -464,6 +467,9 @@ extern void e2fsck_read_inode(e2fsck_t c
struct ext2_inode * inode, const char * proc);
extern void e2fsck_write_inode(e2fsck_t ctx, unsigned long ino,
struct ext2_inode * inode, const char * proc);
+extern void e2fsck_write_inode_full(e2fsck_t ctx, unsigned long ino,
+ struct ext2_inode * inode, int bufsize,
+ const char *proc);
#ifdef MTRACE
extern void mtrace_print(char *mesg);
#endif
@@ -475,3 +481,4 @@ extern void e2fsck_clear_progbar(e2fsck_
extern void e2fsck_clear_progbar(e2fsck_t ctx);
extern int e2fsck_simple_progress(e2fsck_t ctx, const char *label,
float percent, unsigned int dpynum);
+#endif /* _E2FSCK_H */
diff -r 7c019255c280 -r 8599954f924f e2fsck/recovery.c
--- a/e2fsck/recovery.c Mon May 29 11:47:25 2006 -0400
+++ b/e2fsck/recovery.c Wed Jun 28 11:29:56 2006 -0400
@@ -236,7 +236,7 @@ int journal_recover(journal_t *journal)
if (!sb->s_start) {
jbd_debug(1, "No recovery required, last transaction %d\n",
- ntohl(sb->s_sequence));
+ (int)ntohl(sb->s_sequence));
journal->j_transaction_sequence = ntohl(sb->s_sequence) + 1;
return 0;
}
diff -r 7c019255c280 -r 8599954f924f e2fsck/unix.c
--- a/e2fsck/unix.c Mon May 29 11:47:25 2006 -0400
+++ b/e2fsck/unix.c Wed Jun 28 11:29:56 2006 -0400
@@ -568,7 +568,7 @@ static void syntax_err_report(const char
exit(FSCK_ERROR);
}
-static const char *config_fn[] = { "/etc/e2fsck.conf", 0 };
+static const char *config_fn[] = { ROOT_SYSCONFDIR "/e2fsck.conf", 0 };
static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
{
diff -r 7c019255c280 -r 8599954f924f lib/ChangeLog
--- a/lib/ChangeLog Mon May 29 11:47:25 2006 -0400
+++ b/lib/ChangeLog Wed Jun 28 11:29:56 2006 -0400
@@ -1,3 +1,8 @@ 2006-03-17 Theodore Ts'o <[email protected]
+2006-06-28 Andreas Dilger <[email protected]>
+
+ * e2fsck.h, ext2_ext_attr.h: Protect header files from multiple
+ inclusion.
+
2006-03-17 Theodore Ts'o <[email protected]>
* Makefile.library (real-subdirs): Add real-subdirs:: target so
diff -r 7c019255c280 -r 8599954f924f lib/blkid/dev.c
--- a/lib/blkid/dev.c Mon May 29 11:47:25 2006 -0400
+++ b/lib/blkid/dev.c Wed Jun 28 11:29:56 2006 -0400
@@ -68,8 +68,8 @@ void blkid_debug_dump_dev(blkid_dev dev)
}
printf(" dev: name = %s\n", dev->bid_name);
- printf(" dev: DEVNO=\"0x%0llx\"\n", dev->bid_devno);
- printf(" dev: TIME=\"%ld\"\n", dev->bid_time);
+ printf(" dev: DEVNO=\"0x%0llx\"\n", (long long)dev->bid_devno);
+ printf(" dev: TIME=\"%ld\"\n", (long)dev->bid_time);
printf(" dev: PRI=\"%d\"\n", dev->bid_pri);
printf(" dev: flags = 0x%08X\n", dev->bid_flags);
@@ -196,7 +196,7 @@ void usage(char *prog)
void usage(char *prog)
{
fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask]\n", prog);
- fprintf(stderr, "\tList all devices and exit\n", prog);
+ fprintf(stderr, "\tList all devices and exit\n");
exit(1);
}
@@ -219,7 +219,7 @@ int main(int argc, char **argv)
case 'm':
blkid_debug_mask = strtoul (optarg, &tmp, 0);
if (*tmp) {
- fprintf(stderr, "Invalid debug mask: %d\n",
+ fprintf(stderr, "Invalid debug mask: %s\n",
optarg);
exit(1);
}
diff -r 7c019255c280 -r 8599954f924f lib/blkid/devno.c
--- a/lib/blkid/devno.c Mon May 29 11:47:25 2006 -0400
+++ b/lib/blkid/devno.c Wed Jun 28 11:29:56 2006 -0400
@@ -125,7 +125,7 @@ static void scan_dir(char *dirname, dev_
else if (S_ISBLK(st.st_mode) && st.st_rdev == devno) {
*devname = blkid_strdup(path);
DBG(DEBUG_DEVNO,
- printf("found 0x%llx at %s (%p)\n", devno,
+ printf("found 0x%llx at %s (%p)\n", (long long)devno,
path, *devname));
break;
}
@@ -183,7 +183,7 @@ char *blkid_devno_to_devname(dev_t devno
(unsigned long) devno));
} else {
DBG(DEBUG_DEVNO,
- printf("found devno 0x%04llx as %s\n", devno, devname));
+ printf("found devno 0x%04llx as %s\n", (long long)devno, devname));
}
@@ -224,7 +224,7 @@ int main(int argc, char** argv)
}
devno = makedev(major, minor);
}
- printf("Looking for device 0x%04Lx\n", devno);
+ printf("Looking for device 0x%04llx\n", (long long)devno);
devname = blkid_devno_to_devname(devno);
if (devname)
free(devname);
diff -r 7c019255c280 -r 8599954f924f lib/blkid/getsize.c
--- a/lib/blkid/getsize.c Mon May 29 11:47:25 2006 -0400
+++ b/lib/blkid/getsize.c Wed Jun 28 11:29:56 2006 -0400
@@ -70,7 +70,7 @@ static int valid_offset(int fd, blkid_lo
}
/*
- * Returns the number of blocks in a partition
+ * Returns the number of bytes in a partition
*/
blkid_loff_t blkid_get_dev_size(int fd)
{
@@ -122,25 +122,33 @@ blkid_loff_t blkid_get_dev_size(int fd)
return (blkid_loff_t)size << 9;
#endif
+/* tested on FreeBSD 6.1-RELEASE i386 */
+#ifdef DIOCGMEDIASIZE
+ if (ioctl(fd, DIOCGMEDIASIZE, &size64) >= 0)
+ return (off_t)size64;
+#endif /* DIOCGMEDIASIZE */
+
#ifdef FDGETPRM
if (ioctl(fd, FDGETPRM, &this_floppy) >= 0)
return (blkid_loff_t)this_floppy.size << 9;
#endif
#ifdef HAVE_SYS_DISKLABEL_H
-#if 0
/*
- * This should work in theory but I haven't tested it. Anyone
- * on a BSD system want to test this for me? In the meantime,
- * binary search mechanism should work just fine.
+ * This code works for FreeBSD 4.11 i386, except for the full device
+ * (such as /dev/ad0). It doesn't work properly for newer FreeBSD
+ * though. FreeBSD >= 5.0 should be covered by the DIOCGMEDIASIZE
+ * above however.
+ *
+ * Note that FreeBSD >= 4.0 has disk devices as unbuffered (raw,
+ * character) devices, so we need to check for S_ISCHR, too.
*/
- if ((fstat(fd, &st) >= 0) && S_ISBLK(st.st_mode))
+ if ((fstat(fd, &st) >= 0) && (S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode)))
part = st.st_rdev & 7;
if (part >= 0 && (ioctl(fd, DIOCGDINFO, (char *)&lab) >= 0)) {
pp = &lab.d_partitions[part];
if (pp->p_size)
return pp->p_size << 9;
}
-#endif
#endif /* HAVE_SYS_DISKLABEL_H */
{
#ifdef HAVE_FSTAT64
diff -r 7c019255c280 -r 8599954f924f lib/blkid/probe.c
--- a/lib/blkid/probe.c Mon May 29 11:47:25 2006 -0400
+++ b/lib/blkid/probe.c Wed Jun 28 11:29:56 2006 -0400
@@ -153,7 +153,6 @@ static int probe_ext3(struct blkid_probe
unsigned char *buf)
{
struct ext2_super_block *es;
- char uuid[37];
es = (struct ext2_super_block *)buf;
/* Distinguish between jbd and ext2/3 fs */
@@ -225,7 +224,7 @@ static char *no_name = "NO NAME ";
static unsigned char *search_fat_label(struct vfat_dir_entry *dir, int count)
{
- unsigned int i;
+ int i;
for (i = 0; i < count; i++) {
if (dir[i].name[0] == 0x00)
@@ -254,7 +253,7 @@ static int probe_fat(struct blkid_probe
struct msdos_super_block *ms = (struct msdos_super_block *) buf;
struct vfat_dir_entry *dir;
char serno[10];
- const unsigned char *label = 0, *vol_label = 0;
+ const unsigned char *label = 0, *vol_label = 0, *tmp;
unsigned char *vol_serno;
int label_len = 0, maxloop = 100;
__u16 sector_size, dir_entries, reserved;
@@ -262,14 +261,17 @@ static int probe_fat(struct blkid_probe
__u32 buf_size, start_data_sect, next, root_start, root_dir_entries;
/* sector size check */
- sector_size = blkid_le16(*((__u16 *) &ms->ms_sector_size));
+ tmp = (unsigned char *)&ms->ms_sector_size;
+ sector_size = tmp[0] + (tmp[1] << 8);
if (sector_size != 0x200 && sector_size != 0x400 &&
sector_size != 0x800 && sector_size != 0x1000)
return 1;
- dir_entries = blkid_le16(*((__u16 *) &ms->ms_dir_entries));
+ tmp = (unsigned char *)&ms->ms_dir_entries;
+ dir_entries = tmp[0] + (tmp[1] << 8);
reserved = blkid_le16(ms->ms_reserved);
- sect_count = blkid_le16(*((__u16 *) &ms->ms_sectors));
+ tmp = (unsigned char *)&ms->ms_sectors;
+ sect_count = tmp[0] + (tmp[1] << 8);
if (sect_count == 0)
sect_count = blkid_le32(ms->ms_total_sect);
@@ -765,8 +767,8 @@ blkid_dev blkid_verify(blkid_cache cache
return dev;
DBG(DEBUG_PROBE,
- printf("need to revalidate %s (time since last check %lu)\n",
- dev->bid_name, diff));
+ printf("need to revalidate %s (time since last check %llu)\n",
+ dev->bid_name, (unsigned long long)diff));
if (((probe.fd = open(dev->bid_name, O_RDONLY)) < 0) ||
(fstat(probe.fd, &st) < 0)) {
@@ -853,7 +855,7 @@ found_type:
blkid_set_tag(dev, "TYPE", type, 0);
DBG(DEBUG_PROBE, printf("%s: devno 0x%04llx, type %s\n",
- dev->bid_name, st.st_rdev, type));
+ dev->bid_name, (long long)st.st_rdev, type));
}
if (probe.sbbuf)
diff -r 7c019255c280 -r 8599954f924f lib/blkid/probe.h
--- a/lib/blkid/probe.h Mon May 29 11:47:25 2006 -0400
+++ b/lib/blkid/probe.h Wed Jun 28 11:29:56 2006 -0400
@@ -414,7 +414,7 @@ _INLINE_ __u64 blkid_swab64(__u64 val)
-#if __BYTE_ORDER == __BIG_ENDIAN
+#ifdef WORDS_BIGENDIAN
#define blkid_le16(x) blkid_swab16(x)
#define blkid_le32(x) blkid_swab32(x)
#define blkid_le64(x) blkid_swab64(x)
diff -r 7c019255c280 -r 8599954f924f lib/blkid/read.c
--- a/lib/blkid/read.c Mon May 29 11:47:25 2006 -0400
+++ b/lib/blkid/read.c Wed Jun 28 11:29:56 2006 -0400
@@ -452,8 +452,8 @@ static void debug_dump_dev(blkid_dev dev
}
printf(" dev: name = %s\n", dev->bid_name);
- printf(" dev: DEVNO=\"0x%0llx\"\n", dev->bid_devno);
- printf(" dev: TIME=\"%ld\"\n", dev->bid_time);
+ printf(" dev: DEVNO=\"0x%0llx\"\n", (long long)dev->bid_devno);
+ printf(" dev: TIME=\"%lld\"\n", (long long)dev->bid_time);
printf(" dev: PRI=\"%d\"\n", dev->bid_pri);
printf(" dev: flags = 0x%08X\n", dev->bid_flags);
diff -r 7c019255c280 -r 8599954f924f lib/blkid/save.c
--- a/lib/blkid/save.c Mon May 29 11:47:25 2006 -0400
+++ b/lib/blkid/save.c Wed Jun 28 11:29:56 2006 -0400
@@ -38,7 +38,7 @@ static int save_dev(blkid_dev dev, FILE
fprintf(file,
"<device DEVNO=\"0x%04lx\" TIME=\"%ld\"",
- (unsigned long) dev->bid_devno, dev->bid_time);
+ (unsigned long) dev->bid_devno, (long) dev->bid_time);
if (dev->bid_pri)
fprintf(file, " PRI=\"%d\"", dev->bid_pri);
list_for_each(p, &dev->bid_tags) {
diff -r 7c019255c280 -r 8599954f924f lib/blkid/tag.c
--- a/lib/blkid/tag.c Mon May 29 11:47:25 2006 -0400
+++ b/lib/blkid/tag.c Wed Jun 28 11:29:56 2006 -0400
@@ -386,7 +386,7 @@ void usage(char *prog)
fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask] device "
"[type value]\n",
prog);
- fprintf(stderr, "\tList all tags for a device and exit\n", prog);
+ fprintf(stderr, "\tList all tags for a device and exit\n");
exit(1);
}
@@ -412,7 +412,7 @@ int main(int argc, char **argv)
case 'm':
blkid_debug_mask = strtoul (optarg, &tmp, 0);
if (*tmp) {
- fprintf(stderr, "Invalid debug mask: %d\n",
+ fprintf(stderr, "Invalid debug mask: %s\n",
optarg);
exit(1);
}
diff -r 7c019255c280 -r 8599954f924f lib/blkid/test_probe.in
--- a/lib/blkid/test_probe.in Mon May 29 11:47:25 2006 -0400
+++ b/lib/blkid/test_probe.in Wed Jun 28 11:29:56 2006 -0400
@@ -12,7 +12,7 @@ mkdir -p tests
for i in $TESTS
do
- echo -n "$i: "
+ printf "%s: " $i
if test ! -f $SRCDIR/tests/$i.img.bz2 -a \
! -f $SRCDIR/tests/$i.results ;
then
diff -r 7c019255c280 -r 8599954f924f lib/blkid/tst_types.c
--- a/lib/blkid/tst_types.c Mon May 29 11:47:25 2006 -0400
+++ b/lib/blkid/tst_types.c Wed Jun 28 11:29:56 2006 -0400
@@ -11,7 +11,10 @@
#include "blkid/blkid_types.h"
-main(int argc, char **argv)
+#include <stdlib.h>
+#include <stdio.h>
+
+int main(int argc, char **argv)
{
if (sizeof(__u8) != 1) {
printf("Sizeof(__u8) is %d should be 1\n",
diff -r 7c019255c280 -r 8599954f924f lib/ext2fs/ext2_ext_attr.h
--- a/lib/ext2fs/ext2_ext_attr.h Mon May 29 11:47:25 2006 -0400
+++ b/lib/ext2fs/ext2_ext_attr.h Wed Jun 28 11:29:56 2006 -0400
@@ -6,6 +6,8 @@
(C) 2000 Andreas Gruenbacher, <[email protected]>
*/
+#ifndef _EXT2_EXT_ATTR_H
+#define _EXT2_EXT_ATTR_H
/* Magic value in attribute blocks */
#define EXT2_EXT_ATTR_MAGIC_v1 0xEA010000
#define EXT2_EXT_ATTR_MAGIC 0xEA020000
@@ -66,4 +68,4 @@ extern void ext2_ext_attr_done(void);
# define ext2_set_ext_attr NULL
# endif
#endif /* __KERNEL__ */
-
+#endif /* _EXT2_EXT_ATTR_H */
diff -r 7c019255c280 -r 8599954f924f lib/ext2fs/getsize.c
--- a/lib/ext2fs/getsize.c Mon May 29 11:47:25 2006 -0400
+++ b/lib/ext2fs/getsize.c Wed Jun 28 11:29:56 2006 -0400
@@ -44,6 +44,7 @@
#if HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
+#include <ctype.h>
#if defined(__linux__) && defined(_IO) && !defined(BLKGETSIZE)
#define BLKGETSIZE _IO(0x12,96) /* return device size */
diff -r 7c019255c280 -r 8599954f924f lib/ext2fs/ismounted.c
--- a/lib/ext2fs/ismounted.c Mon May 29 11:47:25 2006 -0400
+++ b/lib/ext2fs/ismounted.c Wed Jun 28 11:29:56 2006 -0400
@@ -325,9 +325,9 @@ errcode_t ext2fs_check_mount_point(const
*mount_flags |= EXT2_MF_BUSY;
} else
close(fd);
+#endif
return 0;
-#endif
}
/*
diff -r 7c019255c280 -r 8599954f924f misc/Makefile.in
--- a/misc/Makefile.in Mon May 29 11:47:25 2006 -0400
+++ b/misc/Makefile.in Wed Jun 28 11:29:56 2006 -0400
@@ -288,10 +288,10 @@ install: all $(SMANPAGES) $(UMANPAGES) i
echo " INSTALL_DATA $(man5dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
done
- @if ! test -f $(DESTDIR)/etc/mke2fs.conf; then \
- echo " INSTALL_DATA /etc/mke2fs.conf"; \
+ @if ! test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
+ echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
- $(DESTDIR)/etc/mke2fs.conf; \
+ $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
fi
install-strip: install
diff -r 7c019255c280 -r 8599954f924f misc/blkid.c
--- a/misc/blkid.c Mon May 29 11:47:25 2006 -0400
+++ b/misc/blkid.c Wed Jun 28 11:29:56 2006 -0400
@@ -15,6 +15,7 @@
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#else
+extern int getopt(int argc, char * const argv[], const char *optstring);
extern char *optarg;
extern int optind;
#endif
diff -r 7c019255c280 -r 8599954f924f misc/dumpe2fs.c
--- a/misc/dumpe2fs.c Mon May 29 11:47:25 2006 -0400
+++ b/misc/dumpe2fs.c Wed Jun 28 11:29:56 2006 -0400
@@ -310,10 +310,10 @@ static void print_journal_information(ex
"Journal first block: %u\n"
"Journal sequence: 0x%08x\n"
"Journal start: %u\n"
- "Journal number of users: %lu\n"),
- ntohl(jsb->s_blocksize), ntohl(jsb->s_maxlen),
- ntohl(jsb->s_first), ntohl(jsb->s_sequence),
- ntohl(jsb->s_start), ntohl(jsb->s_nr_users));
+ "Journal number of users: %u\n"),
+ (unsigned int)ntohl(jsb->s_blocksize), (unsigned int)ntohl(jsb->s_maxlen),
+ (unsigned int)ntohl(jsb->s_first), (unsigned int)ntohl(jsb->s_sequence),
+ (unsigned int)ntohl(jsb->s_start), (unsigned int)ntohl(jsb->s_nr_users));
for (i=0; i < ntohl(jsb->s_nr_users); i++) {
uuid_unparse(&jsb->s_users[i*16], str);
diff -r 7c019255c280 -r 8599954f924f misc/mke2fs.c
--- a/misc/mke2fs.c Mon May 29 11:47:25 2006 -0400
+++ b/misc/mke2fs.c Wed Jun 28 11:29:56 2006 -0400
@@ -870,7 +870,7 @@ static void syntax_err_report(const char
exit(1);
}
-static const char *config_fn[] = { "/etc/mke2fs.conf", 0 };
+static const char *config_fn[] = { ROOT_SYSCONFDIR "/mke2fs.conf", 0 };
static void edit_feature(const char *str, __u32 *compat_array)
{
diff -r 7c019255c280 -r 8599954f924f misc/uuidgen.c
--- a/misc/uuidgen.c Mon May 29 11:47:25 2006 -0400
+++ b/misc/uuidgen.c Wed Jun 28 11:29:56 2006 -0400
@@ -16,6 +16,7 @@
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#else
+extern int getopt(int argc, char * const argv[], const char *optstring);
extern char *optarg;
extern int optind;
#endif
diff -r 7c019255c280 -r 8599954f924f tests/f_resize_inode/script
--- a/tests/f_resize_inode/script Mon May 29 11:47:25 2006 -0400
+++ b/tests/f_resize_inode/script Wed Jun 28 11:29:56 2006 -0400
@@ -1,4 +1,4 @@ echo -n "e2fsck with resize_inode: "
-echo -n "e2fsck with resize_inode: "
+printf "e2fsck with resize_inode: "
FSCK_OPT=-yf
OUT=$test_name.log
if [ -f $test_dir/expect.gz ]; then
diff -r 7c019255c280 -r 8599954f924f tests/r_move_itable/script
--- a/tests/r_move_itable/script Mon May 29 11:47:25 2006 -0400
+++ b/tests/r_move_itable/script Wed Jun 28 11:29:56 2006 -0400
@@ -1,4 +1,4 @@ echo -n "resize2fs with resize_inode: "
-echo -n "resize2fs with resize_inode: "
+printf "resize2fs with resize_inode: "
if test -x $RESIZE2FS_EXE; then
diff -r 7c019255c280 -r 8599954f924f tests/r_resize_inode/script
--- a/tests/r_resize_inode/script Mon May 29 11:47:25 2006 -0400
+++ b/tests/r_resize_inode/script Wed Jun 28 11:29:56 2006 -0400
@@ -1,4 +1,4 @@ echo -n "resize2fs with resize_inode: "
-echo -n "resize2fs with resize_inode: "
+printf "resize2fs with resize_inode: "
if test -x $RESIZE2FS_EXE; then
diff -r 7c019255c280 -r 8599954f924f tests/run_e2fsck
--- a/tests/run_e2fsck Mon May 29 11:47:25 2006 -0400
+++ b/tests/run_e2fsck Wed Jun 28 11:29:56 2006 -0400
@@ -1,5 +1,5 @@ if [ "$DESCRIPTION"x != x ]; then
if [ "$DESCRIPTION"x != x ]; then
- echo -n "$DESCRIPTION: "
+ printf "%s" "$DESCRIPTION: "
fi
if [ "$IMAGE"x = x ]; then
IMAGE=$test_dir/image.gz
Cheers, Andreas
--
Andreas Dilger
Principal Software Engineer
Cluster File Systems, Inc.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV