From e2207ce595f05e4db5945326f9b2d553ff7a4d57 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 6 Apr 2000 21:51:18 +0000 Subject: [PATCH] ChangeLog, Makefile.in, jump.funcs, jump.import, jump.params: Makefile.in (uuid_time): Compile uuid_time in two steps (first create .o, then link it against the libraries) to work around bug in a.out linker. dll/jump.funcs, dll/jump.import, dll/jump.params: Update a.out shared library control files to reflect new added files. ChangeLog, feature.c, jump.funcs: feature.c: Make feature_list static; it shouldn't be exported. dll/jump.funcs: Update a.out shared library control file. ChangeLog, badblocks.c: badblocks.c (flush_bufs): Use fsync() if the system doesn't support fdatasync(). --- lib/e2p/ChangeLog | 6 ++ lib/e2p/dll/jump.funcs | 3 + lib/e2p/feature.c | 2 +- lib/uuid/ChangeLog | 9 +++ lib/uuid/Makefile.in | 4 +- lib/uuid/dll/jump.funcs | 5 ++ lib/uuid/dll/jump.import | 163 +++++++++++++++++++++++++++++++++++++++++++++++ lib/uuid/dll/jump.params | 2 +- misc/ChangeLog | 5 ++ misc/badblocks.c | 5 ++ 10 files changed, 201 insertions(+), 3 deletions(-) diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog index e69cc20f..5293aae2 100644 --- a/lib/e2p/ChangeLog +++ b/lib/e2p/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 6 17:38:00 2000 Theodore Y. Ts'o + + * feature.c: Make feature_list static; it shouldn't be exported. + + * dll/jump.funcs: Update a.out shared library control file. + 2000-04-03 Theodore Ts'o * pf.c (print_flags): Rename EXT2_NOCOMP_FL to EXT2_NOCOMPR_FL. diff --git a/lib/e2p/dll/jump.funcs b/lib/e2p/dll/jump.funcs index 6173ddc2..7ea87daf 100644 --- a/lib/e2p/dll/jump.funcs +++ b/lib/e2p/dll/jump.funcs @@ -13,3 +13,6 @@ 00000000 T _setversion libe2p setversion 00000000 T _e2p_is_null_uuid libe2p uuid 00000000 T _e2p_uuid_to_str libe2p uuid +00000000 T _e2p_feature2string libe2p feature +00000000 T _e2p_string2feature libe2p feature +00000000 T _e2p_edit_feature libe2p feature diff --git a/lib/e2p/feature.c b/lib/e2p/feature.c index eee64e68..327c8d45 100644 --- a/lib/e2p/feature.c +++ b/lib/e2p/feature.c @@ -63,7 +63,7 @@ struct feature { const char *string; }; -struct feature feature_list[] = { +static struct feature feature_list[] = { { E2P_FEATURE_COMPAT, EXT2_FEATURE_COMPAT_DIR_PREALLOC, "dir_prealloc" }, { E2P_FEATURE_COMPAT, EXT3_FEATURE_COMPAT_HAS_JOURNAL, diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog index fd4acd88..8e608bc5 100644 --- a/lib/uuid/ChangeLog +++ b/lib/uuid/ChangeLog @@ -1,3 +1,12 @@ +Thu Apr 6 17:38:58 2000 Theodore Y. Ts'o + + * Makefile.in (uuid_time): Compile uuid_time in two steps (first + create .o, then link it against the libraries) to work + around bug in a.out linker. + + * dll/jump.funcs, dll/jump.import, dll/jump.params: Update a.out + shared library control files to reflect new added files. + 2000-04-03 Theodore Ts'o * gen_uuid.c (get_clock): Fix bug where the last timeval wasn't diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in index 2000f4cb..8494d007 100644 --- a/lib/uuid/Makefile.in +++ b/lib/uuid/Makefile.in @@ -91,7 +91,9 @@ tst_uuid: tst_uuid.o $(DEPLIBUUID) $(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(LIBUUID) uuid_time: $(srcdir)/uuid_time.c $(DEPLIBUUID) - $(CC) $(ALL_CFLAGS) -DDEBUG $(srcdir)/uuid_time.c -o uuid_time $(LIBUUID) + $(CC) $(ALL_CFLAGS) -DDEBUG $(srcdir)/uuid_time.c -c -o uuid_time.o + $(CC) -o uuid_time uuid_time.o $(LIBUUID) + $(RM) uuid_time.o libuuid.3: $(DEP_SUBSTITUTE) $(srcdir)/libuuid.3.in $(SUBSTITUTE) $(srcdir)/libuuid.3.in libuuid.3 diff --git a/lib/uuid/dll/jump.funcs b/lib/uuid/dll/jump.funcs index cd75bb8f..efe1e254 100644 --- a/lib/uuid/dll/jump.funcs +++ b/lib/uuid/dll/jump.funcs @@ -7,3 +7,8 @@ 00000000 T _uuid_parse libuuid parse 00000000 T _uuid_unpack libuuid unpack 00000000 T _uuid_unparse libuuid unparse +00000000 T _uuid_generate_time libuuid gen_uuid +00000000 T _uuid_generate_random libuuid gen_uuid +00000000 T _uuid_time libuuid uuid_time +00000000 T _uuid_type libuuid uuid_time +00000000 T _uuid_variant libuuid uuid_time diff --git a/lib/uuid/dll/jump.import b/lib/uuid/dll/jump.import index e69de29b..38ab6b26 100644 --- a/lib/uuid/dll/jump.import +++ b/lib/uuid/dll/jump.import @@ -0,0 +1,163 @@ +/usr/lib/libc.sa(__libc.o):6008f0b0 A _AL +/usr/lib/libc.sa(__libc.o):6008f198 A _AL_PARM +/usr/lib/libc.sa(__libc.o):6008f060 A _AM +/usr/lib/libc.sa(__libc.o):6008f0b4 A _BC +/usr/lib/libc.sa(__libc.o):6008f064 A _BS +/usr/lib/libc.sa(__libc.o):6008f0bc A _BT +/usr/lib/libc.sa(__libc.o):6008f068 A _CA +/usr/lib/libc.sa(__libc.o):6008f0c0 A _CD +/usr/lib/libc.sa(__libc.o):6008f0c4 A _CE +/usr/lib/libc.sa(__libc.o):6008f0c8 A _CL +/usr/lib/libc.sa(__libc.o):6008f0cc A _CM +/usr/lib/libc.sa(__libc.o):6008f048 A _COLS +/usr/lib/libc.sa(__libc.o):6008f0d0 A _CR +/usr/lib/libc.sa(__libc.o):6008f0d4 A _CS +/usr/lib/libc.sa(__libc.o):6008f06c A _DA +/usr/lib/libc.sa(__libc.o):6008f070 A _DB +/usr/lib/libc.sa(__libc.o):6008f0d8 A _DC +/usr/lib/libc.sa(__libc.o):6008f0dc A _DL +/usr/lib/libc.sa(__libc.o):6008f19c A _DL_PARM +/usr/lib/libc.sa(__libc.o):6008f0e0 A _DM +/usr/lib/libc.sa(__libc.o):6008f0e4 A _DO +/usr/lib/libc.sa(__libc.o):6008f1a4 A _DOWN_PARM +/usr/lib/libc.sa(__libc.o):6008f03c A _Def_term +/usr/lib/libc.sa(__libc.o):6008f0e8 A _ED +/usr/lib/libc.sa(__libc.o):6008f0ec A _EI +/usr/lib/libc.sa(__libc.o):6008f074 A _EO +/usr/lib/libc.sa(__libc.o):6008f1b8 A _GT +/usr/lib/libc.sa(__libc.o):6008f078 A _HC +/usr/lib/libc.sa(__libc.o):6008f118 A _HO +/usr/lib/libc.sa(__libc.o):6008f07c A _HZ +/usr/lib/libc.sa(__libc.o):6008f11c A _IC +/usr/lib/libc.sa(__libc.o):6008f120 A _IM +/usr/lib/libc.sa(__libc.o):6008f080 A _IN +/usr/lib/libc.sa(__libc.o):6008f124 A _IP +/usr/lib/libc.sa(__libc.o):6008f0f0 A _K0 +/usr/lib/libc.sa(__libc.o):6008f0f4 A _K1 +/usr/lib/libc.sa(__libc.o):6008f0f8 A _K2 +/usr/lib/libc.sa(__libc.o):6008f0fc A _K3 +/usr/lib/libc.sa(__libc.o):6008f100 A _K4 +/usr/lib/libc.sa(__libc.o):6008f104 A _K5 +/usr/lib/libc.sa(__libc.o):6008f108 A _K6 +/usr/lib/libc.sa(__libc.o):6008f10c A _K7 +/usr/lib/libc.sa(__libc.o):6008f110 A _K8 +/usr/lib/libc.sa(__libc.o):6008f114 A _K9 +/usr/lib/libc.sa(__libc.o):6008f128 A _KD +/usr/lib/libc.sa(__libc.o):6008f12c A _KE +/usr/lib/libc.sa(__libc.o):6008f130 A _KH +/usr/lib/libc.sa(__libc.o):6008f134 A _KL +/usr/lib/libc.sa(__libc.o):6008f138 A _KR +/usr/lib/libc.sa(__libc.o):6008f13c A _KS +/usr/lib/libc.sa(__libc.o):6008f140 A _KU +/usr/lib/libc.sa(__libc.o):6008f1a8 A _LEFT_PARM +/usr/lib/libc.sa(__libc.o):6008f044 A _LINES +/usr/lib/libc.sa(__libc.o):6008f144 A _LL +/usr/lib/libc.sa(__libc.o):6008f148 A _MA +/usr/lib/libc.sa(__libc.o):6008f300 A _MCAppPath +/usr/lib/libc.sa(__libc.o):6008f084 A _MI +/usr/lib/libc.sa(__libc.o):6008f088 A _MS +/usr/lib/libc.sa(__libc.o):6008f030 A _My_term +/usr/lib/libc.sa(__libc.o):6008f08c A _NC +/usr/lib/libc.sa(__libc.o):6008f14c A _ND +/usr/lib/libc.sa(__libc.o):6008f150 A _NL +/usr/lib/libc.sa(__libc.o):6008f1bc A _NONL +/usr/lib/libc.sa(__libc.o):6008f090 A _NS +/usr/lib/libc.sa(__libc.o):6008f094 A _OS +/usr/lib/libc.sa(__libc.o):6008f1b0 A _PC +/usr/lib/libc.sa(__libc.o):6008f154 A _RC +/usr/lib/libc.sa(__libc.o):6008f1ac A _RIGHT_PARM +/usr/lib/libc.sa(__libc.o):6008f158 A _SC +/usr/lib/libc.sa(__libc.o):6008f15c A _SE +/usr/lib/libc.sa(__libc.o):6008f160 A _SF +/usr/lib/libc.sa(__libc.o):6008f164 A _SO +/usr/lib/libc.sa(__libc.o):6008f168 A _SR +/usr/lib/libc.sa(__libc.o):6008f16c A _TA +/usr/lib/libc.sa(__libc.o):6008f170 A _TE +/usr/lib/libc.sa(__libc.o):6008f174 A _TI +/usr/lib/libc.sa(__libc.o):6008f178 A _UC +/usr/lib/libc.sa(__libc.o):6008f17c A _UE +/usr/lib/libc.sa(__libc.o):6008f098 A _UL +/usr/lib/libc.sa(__libc.o):6008f180 A _UP +/usr/lib/libc.sa(__libc.o):6008f1c0 A _UPPERCASE +/usr/lib/libc.sa(__libc.o):6008f1a0 A _UP_PARM +/usr/lib/libc.sa(__libc.o):6008f188 A _US +/usr/lib/libc.sa(__libc.o):6008f18c A _VB +/usr/lib/libc.sa(__libc.o):6008f194 A _VE +/usr/lib/libc.sa(__libc.o):6008f190 A _VS +/usr/lib/libc.sa(__libc.o):6008f09c A _XB +/usr/lib/libc.sa(__libc.o):6008f0a0 A _XN +/usr/lib/libc.sa(__libc.o):6008f0a8 A _XS +/usr/lib/libc.sa(__libc.o):6008f0a4 A _XT +/usr/lib/libc.sa(__libc.o):6008f0ac A _XX +/usr/lib/libc.sa(__libc.o):6008f2a4 A __IO_file_jumps +/usr/lib/libc.sa(__libc.o):6008f1f4 A __IO_list_all +/usr/lib/libc.sa(__libc.o):6008f2a8 A __IO_proc_jumps +/usr/lib/libc.sa(__libc.o):6008f1ec A __IO_stderr_ +/usr/lib/libc.sa(__libc.o):6008f1e4 A __IO_stdin_ +/usr/lib/libc.sa(__libc.o):6008f1e8 A __IO_stdout_ +/usr/lib/libc.sa(__libc.o):6008f2ac A __IO_str_jumps +/usr/lib/libc.sa(__libc.o):6008f214 A ____brk_addr +/usr/lib/libc.sa(__libc.o):6008f01c A ___ctype_b +/usr/lib/libc.sa(__libc.o):6008f020 A ___ctype_tolower +/usr/lib/libc.sa(__libc.o):6008f024 A ___ctype_toupper +/usr/lib/libc.sa(__libc.o):6008f1fc A ___environ +/usr/lib/libc.sa(__libc.o):6008f250 A ___exit_funcs +/usr/lib/libc.sa(__libc.o):6008f2f0 A ___glob_closedir_hook +/usr/lib/libc.sa(__libc.o):6008f2f4 A ___glob_opendir_hook +/usr/lib/libc.sa(__libc.o):6008f2f8 A ___glob_readdir_hook +/usr/lib/libc.sa(__libc.o):6008f278 A ___ttyname +/usr/lib/libc.sa(__libc.o):6008f238 A __collate_info +/usr/lib/libc.sa(__libc.o):6008f23c A __ctype_info +/usr/lib/libc.sa(__libc.o):6008f028 A __echoit +/usr/lib/libc.sa(__libc.o):6008f034 A __endwin +/usr/lib/libc.sa(__libc.o):6008f288 A __gdbm_fetch_val +/usr/lib/libc.sa(__libc.o):6008f280 A __gdbm_file +/usr/lib/libc.sa(__libc.o):6008f284 A __gdbm_memory +/usr/lib/libc.sa(__libc.o):6008f240 A __monetary_info +/usr/lib/libc.sa(__libc.o):6008f234 A __null_auth +/usr/lib/libc.sa(__libc.o):6008f244 A __numeric_info +/usr/lib/libc.sa(__libc.o):6008f2ec A __obstack +/usr/lib/libc.sa(__libc.o):6008f1c8 A __pfast +/usr/lib/libc.sa(__libc.o):6008f02c A __rawmode +/usr/lib/libc.sa(__libc.o):6008f1dc A __res +/usr/lib/libc.sa(__libc.o):6008f04c A __res_iflg +/usr/lib/libc.sa(__libc.o):6008f050 A __res_lflg +/usr/lib/libc.sa(__libc.o):6008f270 A __res_opcodes +/usr/lib/libc.sa(__libc.o):6008f274 A __res_resultcodes +/usr/lib/libc.sa(__libc.o):6008f248 A __response_info +/usr/lib/libc.sa(__libc.o):6008f2fc A __sigintr +/usr/lib/libc.sa(__libc.o):6008f00c A __sys_errlist +/usr/lib/libc.sa(__libc.o):6008f010 A __sys_nerr +/usr/lib/libc.sa(__libc.o):6008f014 A __sys_siglist +/usr/lib/libc.sa(__libc.o):6008f24c A __time_info +/usr/lib/libc.sa(__libc.o):6008f05c A __tty +/usr/lib/libc.sa(__libc.o):6008f040 A __tty_ch +/usr/lib/libc.sa(__libc.o):6008f1cc A __unctrl +/usr/lib/libc.sa(__libc.o):6008f27c A __win +/usr/lib/libc.sa(__libc.o):6008f058 A _curscr +/usr/lib/libc.sa(__libc.o):6008f228 A _daylight +/usr/lib/libc.sa(__libc.o):6008f200 A _errno +/usr/lib/libc.sa(__libc.o):6008f1d0 A _gdbm_errno +/usr/lib/libc.sa(__libc.o):6008f28c A _gdbm_version +/usr/lib/libc.sa(__libc.o):6008f008 A _h_errlist +/usr/lib/libc.sa(__libc.o):6008f1d8 A _h_errno +/usr/lib/libc.sa(__libc.o):6008f2a0 A _h_nerr +/usr/lib/libc.sa(__libc.o):6008f1c4 A _normtty +/usr/lib/libc.sa(__libc.o):6008f204 A _optarg +/usr/lib/libc.sa(__libc.o):6008f20c A _opterr +/usr/lib/libc.sa(__libc.o):6008f208 A _optind +/usr/lib/libc.sa(__libc.o):6008f2e4 A _optopt +/usr/lib/libc.sa(__libc.o):6008f218 A _ospeed +/usr/lib/libc.sa(__libc.o):6008f26c A _re_max_failures +/usr/lib/libc.sa(__libc.o):6008f210 A _re_syntax_options +/usr/lib/libc.sa(__libc.o):6008f1e0 A _rexecoptions +/usr/lib/libc.sa(__libc.o):6008f230 A _rpc_createerr +/usr/lib/libc.sa(__libc.o):6008f25c A _stderr +/usr/lib/libc.sa(__libc.o):6008f254 A _stdin +/usr/lib/libc.sa(__libc.o):6008f258 A _stdout +/usr/lib/libc.sa(__libc.o):6008f054 A _stdscr +/usr/lib/libc.sa(__libc.o):6008f2e8 A _svc_fdset +/usr/lib/libc.sa(__libc.o):6008f224 A _timezone +/usr/lib/libc.sa(__libc.o):6008f21c A _tputs_baud_rate +/usr/lib/libc.sa(__libc.o):6008f038 A _ttytype +/usr/lib/libc.sa(__libc.o):6008f220 A _tzname diff --git a/lib/uuid/dll/jump.params b/lib/uuid/dll/jump.params index efd35138..b69b61bb 100644 --- a/lib/uuid/dll/jump.params +++ b/lib/uuid/dll/jump.params @@ -3,4 +3,4 @@ Text=0x67900000 Data=0x00000000 Jump=0x00001000 GOT=0x00001000 -Version=0.0.0 +Version=0.1.0 diff --git a/misc/ChangeLog b/misc/ChangeLog index 8240ff0a..37ee1f9c 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,3 +1,8 @@ +Thu Apr 6 17:50:25 2000 Theodore Y. Ts'o + + * badblocks.c (flush_bufs): Use fsync() if the system doesn't + support fdatasync(). + 2000-04-03 Theodore Ts'o * badblocks.c, dumpe2fs.c, e2label.c, mke2fs.c, tune2fs.c, diff --git a/misc/badblocks.c b/misc/badblocks.c index 747b6310..e0a5b735 100644 --- a/misc/badblocks.c +++ b/misc/badblocks.c @@ -225,8 +225,13 @@ static void flush_bufs (int dev, int sync) ) fprintf (stderr, _("Flushing buffers\n")); +#ifdef HAVE_FDATASYNC if (sync && fdatasync (dev) == -1) + com_err (program_name, errno, _("during fdatasync")); +#else + if (sync && fsync (dev) == -1) com_err (program_name, errno, _("during fsync")); +#endif #ifdef BLKFLSBUF ioctl (host_dev, BLKFLSBUF, 0); /* In case this is a HD */ -- 2.11.0