vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

Many files: 

Update copyright of files in preparation for release of resize2fs.
  	Also removed the (obsolete) beta-test check that had been in the code,
  	as well as the old spec files used to package the separate
  	distribution of resize2fs.
  Makefile.in: No longer build resize2fs.static, since there's no real
  point in it any more.
  Modified Files:
  	ChangeLog Makefile.in extent.c main.c resize2fs.8.in
  	resize2fs.c resize2fs.h sim_progress.c test_extent.c
  Removed Files:
  	e2fsprogs-1.12.spec pq.gif resize2fs.spec version.h
bitmap-optimize
Theodore Ts'o 2000-04-06 21:38:34 +00:00
parent 3eccb84d89
commit 0cee8a5c42
13 changed files with 68 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resize/ChangeLog
View File

@ -1,3 +1,13 @@
2000-04-06 Theodore Ts'o <tytso@valinux.com>
* Update copyright of files in preparation for release of
resize2fs. Also removed the (obsolete) beta-test check
that had been in the code, as well as the old spec files
used to package the separate distribution of resize2fs.
* Makefile.in: No longer build resize2fs.static, since there's no
real point in it any more.
2000-04-03 Theodore Ts'o <tytso@valinux.com>
* main.c: For platforms that don't define optarg.h, manually

27
resize/Makefile.in
View File

@ -34,7 +34,7 @@ STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
.c.o:
$(CC) -c $(ALL_CFLAGS) $< -o $@
all:: $(PROGS) $(TEST_PROGS) $(MANPAGES) resize2fs.static
all:: $(PROGS) $(TEST_PROGS) $(MANPAGES)
resize2fs: $(RESIZE_OBJS) $(DEPLIBS)
$(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS)
@ -126,18 +126,19 @@ source_tar_file: $(top_srcdir)/.exclude-file
# the Makefile.in file
#
extent.o: $(srcdir)/extent.c $(srcdir)/resize2fs.h \
$(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
$(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h
$(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
$(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
resize2fs.o: $(srcdir)/resize2fs.c $(srcdir)/resize2fs.h \
$(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
$(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h
$(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
$(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
main.o: $(srcdir)/main.c $(srcdir)/resize2fs.h \
$(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
$(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/version.h
$(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
$(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
$(srcdir)/../version.h
sim_progress.o: $(srcdir)/sim_progress.c $(srcdir)/resize2fs.h \
$(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
$(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h
$(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
$(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h

108
resize/e2fsprogs-1.12.spec
View File

@ -1,108 +0,0 @@
Summary: Tools for the second extended (ext2) filesystem
Name: e2fsprogs
Version: 1.12
Release: 0
Copyright: GPL
Group: Utilities/System
Source: ftp://tsx-11.mit.edu/pub/linux/packages/ext2fs/e2fsprogs-1.12.tar.gz
BuildRoot: /tmp/e2fsprogs-root
%description
This package includes a number of utilities for creating, checking,
and repairing ext2 filesystems.
%package devel
Summary: e2fs static libs and headers
Group: Development/Libraries
Requires: e2fsprogs
%description devel
Libraries and header files needed to develop ext2 filesystem-specific
programs.
%package -n resize2fs
Summary: ext2 filesystem resizer
Group: Utilities/System
Requires: e2fsprogs
%description -n resize2fs
This program will allow you to enlarge or shrink an ext2 filesystem.
%prep
%setup
%build
CFLAGS="$RPM_OPT_FLAGS" ./configure --enable-elf-shlibs
make libs progs docs
rm -f resize/resize2fs
mv resize/resize2fs.static resize/resize2fs
%install
export PATH=/sbin:$PATH
make install DESTDIR="$RPM_BUILD_ROOT"
make install-libs DESTDIR="$RPM_BUILD_ROOT"
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
%postun
/sbin/ldconfig
%files
%attr(-, root, root) %doc README RELEASE-NOTES
%attr(-, root, root) /sbin/e2fsck
%attr(-, root, root) /sbin/e2label
%attr(-, root, root) /sbin/fsck.ext2
%attr(-, root, root) /sbin/debugfs
%attr(-, root, root) /sbin/mke2fs
%attr(-, root, root) /sbin/badblocks
%attr(-, root, root) /sbin/tune2fs
%attr(-, root, root) /sbin/dumpe2fs
%attr(-, root, root) /sbin/fsck
%attr(-, root, root) /usr/sbin/mklost+found
%attr(-, root, root) /sbin/mkfs.ext2
%attr(-, root, root) /lib/libe2p.so.2.3
%attr(-, root, root) /lib/libext2fs.so.2.4
%attr(-, root, root) /lib/libss.so.2.0
%attr(-, root, root) /lib/libcom_err.so.2.0
%attr(-, root, root) /lib/libuuid.so.1.1
%attr(-, root, root) /usr/bin/chattr
%attr(-, root, root) /usr/bin/lsattr
%attr(-, root, root) /usr/man/man8/e2fsck.8
%attr(-, root, root) /usr/man/man8/debugfs.8
%attr(-, root, root) /usr/man/man8/tune2fs.8
%attr(-, root, root) /usr/man/man8/mklost+found.8
%attr(-, root, root) /usr/man/man8/mke2fs.8
%attr(-, root, root) /usr/man/man8/dumpe2fs.8
%attr(-, root, root) /usr/man/man8/badblocks.8
%attr(-, root, root) /usr/man/man8/fsck.8
%attr(-, root, root) /usr/man/man1/chattr.1
%attr(-, root, root) /usr/man/man1/lsattr.1
%files devel
%attr(-, root, root) /usr/info/libext2fs.info*
%attr(-, root, root) /usr/lib/libe2p.a
%attr(-, root, root) /usr/lib/libext2fs.a
%attr(-, root, root) /usr/lib/libss.a
%attr(-, root, root) /usr/lib/libcom_err.a
%attr(-, root, root) /usr/lib/libuuid.a
%attr(-, root, root) /usr/include/ss
%attr(-, root, root) /usr/include/ext2fs
%attr(-, root, root) /usr/include/et
%attr(-, root, root) /usr/include/uuid
%attr(-, root, root) /usr/lib/libe2p.so
%attr(-, root, root) /usr/lib/libext2fs.so
%attr(-, root, root) /usr/lib/libss.so
%attr(-, root, root) /usr/lib/libcom_err.so
%attr(-, root, root) /usr/lib/libuuid.so
%files -n resize2fs
%attr(-, root, root) /usr/man/man8/resize2fs.8
%attr(-, root, root) /usr/sbin/resize2fs

8
resize/extent.c
View File

@ -5,10 +5,14 @@
* translation table, for moving multiple contiguous ranges (extents)
* of blocks or inodes.
*
* Copyright (C) 1997 Theodore Ts'o
* Copyright (C) 1997, 1998 by Theodore Ts'o and
* PowerQuest, Inc.
*
* Copyright (C) 1999, 2000 by Theosore Ts'o
*
* %Begin-Header%
* All rights reserved.
* This file may be redistributed under the terms of the GNU Public
* License.
* %End-Header%
*/

45
resize/main.c
View File

@ -1,10 +1,14 @@
/*
* main.c --- ext2 resizer main program
*
* Copyright (C) 1997 Theodore Ts'o
* Copyright (C) 1997, 1998 by Theodore Ts'o and
* PowerQuest, Inc.
*
* Copyright (C) 1999, 2000 by Theosore Ts'o
*
* %Begin-Header%
* All rights reserved.
* This file may be redistributed under the terms of the GNU Public
* License.
* %End-Header%
*/
@ -19,13 +23,7 @@ extern int optind;
#include "resize2fs.h"
#include "./version.h"
/* #define EXPIRE_TIME 905835600 */
#ifdef EXPIRE_TIME
static void check_expire_time(const char *progname);
#endif
#include "../version.h"
char *program_name, *device_name;
@ -33,9 +31,6 @@ static volatile void usage (char *prog)
{
fprintf (stderr, "usage: %s [-d debug_flags] [-f] [-F] [-p] device [new-size]\n\n", prog);
#ifdef EXPIRE_TIME
check_expire_time(program_name);
#endif
exit (1);
}
@ -111,27 +106,6 @@ static void check_mount(char *device)
exit(1);
}
#ifdef EXPIRE_TIME
static void check_expire_time(const char *progname)
{
time_t timenow;
timenow = time(0);
if (timenow > EXPIRE_TIME) {
fprintf(stderr, "This beta-test version of %s is expired.\n"
"Please contact PowerQuest to get an updated version "
"of this program.\n\n", progname);
exit(1);
} else {
fprintf(stderr, "Please note this is a beta-test version of "
"%s which will\nexpire in %d days.\n\n", progname,
(EXPIRE_TIME - timenow) / (60*60*24));
}
}
#endif
int main (int argc, char ** argv)
{
@ -152,7 +126,6 @@ int main (int argc, char ** argv)
fprintf (stderr, "resize2fs %s (%s)\n",
E2FSPROGS_VERSION, E2FSPROGS_DATE);
fprintf(stderr, "Copyright 1998 by Theodore Ts'o and PowerQuest, Inc. All Rights Reserved.\n\n");
if (argc && *argv)
program_name = *argv;
@ -180,10 +153,6 @@ int main (int argc, char ** argv)
if (optind == argc)
usage(program_name);
#ifdef EXPIRE_TIME
check_expire_time(program_name);
#endif
device_name = argv[optind++];
if (optind < argc) {
new_size = strtoul(argv[optind++], &tmp, 0);

BIN
resize/pq.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 358 B

9
resize/resize2fs.8.in
View File

@ -2,7 +2,7 @@
.\" Copyright 1997 by Theodore Ts'o. All Rights Reserved.
.\"
.\" .TH RESIZE2FS 8 "@E2FSPROGS_MONTH@ @E2FSPROGS_YEAR@" "E2fsprogs version @E2FSPROGS_VERSION@"
.TH RESIZE2FS 8 "September 1998" "Resize2fs version 1.03"
.TH RESIZE2FS 8 "@E2FSPROGS_MONTH@ @E2FSPROGS_YEAR@" "E2fsprogs version @E2FSPROGS_VERSION@"
.SH NAME
resize2fs \- ext2 file system resizer
.SH SYNOPSIS
@ -96,12 +96,9 @@ was written by Theodore Ts'o <tytso@mit.edu>.
.SH COPYRIGHT
Resize2fs is Copyright 1998 by Theodore Ts'o and PowerQuest, Inc. All
rights reserved.
As of April, 2000
.B Resize2fs
may not be redistributed without the prior
consent of PowerQuest. This version of
.B resize2fs
is available to licensed
users of Partition Magic(tm).
may be redistributed under the terms of the GPL.
.SH SEE ALSO
.BR fdisk (8),
.BR e2fsck (8),

8
resize/resize2fs.c
View File

@ -1,10 +1,14 @@
/*
* resize2fs.c --- ext2 main routine
*
* Copyright (C) 1997 Theodore Ts'o
* Copyright (C) 1997, 1998 by Theodore Ts'o and
* PowerQuest, Inc.
*
* Copyright (C) 1999, 2000 by Theosore Ts'o
*
* %Begin-Header%
* All rights reserved.
* This file may be redistributed under the terms of the GNU Public
* License.
* %End-Header%
*/

8
resize/resize2fs.h
View File

@ -1,10 +1,14 @@
/*
* resize2fs.h --- ext2 resizer header file
*
* Copyright (C) 1997 Theodore Ts'o
* Copyright (C) 1997, 1998 by Theodore Ts'o and
* PowerQuest, Inc.
*
* Copyright (C) 1999, 2000 by Theosore Ts'o
*
* %Begin-Header%
* All rights reserved.
* This file may be redistributed under the terms of the GNU Public
* License.
* %End-Header%
*/

44
resize/resize2fs.spec
View File

@ -1,44 +0,0 @@
Summary: ext2 filesystem resizer
Name: resize2fs
Version: 1.03
Release: 0
Vendor: PowerQuest
Copyright: Licensed to Registered Users of Partition Magic(tm)
Group: Utilities/System
Requires: e2fsprogs
Source: e2fsprogs-ALL-1.12.tar.gz
Icon: pq.gif
BuildRoot: /tmp/e2fsprogs-root
%description
This program will allow you to enlarge or shrink an ext2 filesystem.
Resize2fs is Copyright 1998 by Theodore Ts'o and PowerQuest, Inc. All
rights reserved. Resize2fs may not be redistributed without the prior
consent of PowerQuest. This version of resize2fs is available to licensed
users of Partition Magic(tm).
%prep
%setup -n e2fsprogs-1.12
%build
CFLAGS="$RPM_OPT_FLAGS" ./configure
rm -rf e2fsck misc debugfs lib/ss lib/e2p lib/uuid tests
make libs progs docs
rm -f resize/resize2fs
mv resize/resize2fs.static resize/resize2fs
%install
export PATH=/sbin:$PATH
make install DESTDIR="$RPM_BUILD_ROOT"
make install-libs DESTDIR="$RPM_BUILD_ROOT"
%clean
rm -rf $RPM_BUILD_ROOT
%files
%attr(-, root, root) /usr/man/man8/resize2fs.8
%attr(-, root, root) /usr/sbin/resize2fs

10
resize/sim_progress.c
View File

@ -1,5 +1,15 @@
/*
* sim_progress.c --- simple progress meter
*
* Copyright (C) 1997, 1998 by Theodore Ts'o and
* PowerQuest, Inc.
*
* Copyright (C) 1999, 2000 by Theosore Ts'o
*
* %Begin-Header%
* This file may be redistributed under the terms of the GNU Public
* License.
* %End-Header%
*/
#include "resize2fs.h"

8
resize/test_extent.c
View File

@ -1,10 +1,14 @@
/*
* test_extent.c --- tester for the extent abstraction
*
* Copyright (C) 1997 Theodore Ts'o
* Copyright (C) 1997, 1998 by Theodore Ts'o and
* PowerQuest, Inc.
*
* Copyright (C) 1999, 2000 by Theosore Ts'o
*
* %Begin-Header%
* All rights reserved.
* This file may be redistributed under the terms of the GNU Public
* License.
* %End-Header%
*/

11
resize/version.h
View File

@ -1,11 +0,0 @@
/*
* version.h --- controls the version number printed by the resize2fs
* program.
*
* Copyright 1995, 1996, 1997, 1998 by Theodore Ts'o. This file may
* be redistributed under the GNU Public License.
*/
#define E2FSPROGS_VERSION "1.03"
#define E2FSPROGS_DATE "28-Sep-98"