Many files:
Checked in e2fsprogs-1.07
diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog
index b276ddb..6739575 100644
--- a/lib/uuid/ChangeLog
+++ b/lib/uuid/ChangeLog
@@ -1,3 +1,34 @@
+Wed Mar 12 13:32:05 1997 Theodore Y. Ts'o <tytso@mit.edu>
+
+ * Release of E2fsprogs version 1.07
+
+Sun Mar 2 16:45:36 1997 Theodore Ts'o <tytso@rsts-11.mit.edu>
+
+ * Makefile.in (ELF_VERSION): Change version to be 1.1
+
+Thu Feb 6 23:08:07 1997 Theodore Ts'o <tytso@rsts-11.mit.edu>
+
+ * gen_uuid.c (uuid_generate): Set Multicast bit when picking a
+ random node_id, to prevent conflicts with IEEE 802
+ addresses obtained from network cards.
+
+Wed Jan 1 23:51:09 1997 Theodore Ts'o <tytso@rsts-11.mit.edu>
+
+ * unpack.c, pack.c: Include string.h, since we use memcpy().
+
+Tue Dec 3 13:05:11 1996 Theodore Ts'o <tytso@rsts-11.mit.edu>
+
+ * parse.c: Add #include of ctype.h and stdlib.h, to pull in the
+ required prototypes.
+
+Fri Oct 11 17:15:10 1996 Theodore Ts'o <tytso@rsts-11.mit.edu>
+
+ * Makefile.in (DLL_ADDRESS): Updated DLL address for libuuid.
+
+Tue Oct 8 02:02:03 1996 Theodore Ts'o <tytso@rsts-11.mit.edu>
+
+ * Release of E2fsprogs version 1.06
+
Thu Sep 12 15:23:07 1996 Theodore Ts'o <tytso@rsts-11.mit.edu>
* Release of E2fsprogs version 1.05
diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index c226197..a186f2a 100644
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -39,20 +39,21 @@
LIBRARY= libuuid
LIBDIR= uuid
-DLL_ADDRESS = 0x66980000
+DLL_ADDRESS = 0x67900000
DLL_JUMPSIZE = 0x1000
DLL_GOTSIZE = 0x1000
-DLL_VERSION = 1.0
+DLL_VERSION = 0.0
DLL_IMAGE = libuuid
DLL_STUB = libuuid
DLL_MYDIR = uuid
DLL_INSTALL_DIR = $(libdir)
-ELF_VERSION = 1.0
+ELF_VERSION = 1.1
ELF_SO_VERSION = 1
ELF_IMAGE = libuuid
ELF_MYDIR = uuid
ELF_INSTALL_DIR = $(libdir)
+ELF_OTHER_LIBS = -lc
BSDLIB_VERSION = 1.0
BSDLIB_IMAGE = libuuid
@@ -68,7 +69,7 @@
.c.o:
$(CC) $(ALL_CFLAGS) -c $< -o $@
-@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -pg -o profiled/$*.o -c $<
+@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
@CHECKER_CMT@ $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
@DLL_CMT@ (export JUMP_DIR=`pwd`/jump; $(CC) -B$(JUMP_PREFIX) $(ALL_CFLAGS) \
@DLL_CMT@ -o jump/$*.o -c $<)
@@ -77,6 +78,9 @@
all:: tst_uuid
+tst_uuid.o: $(srcdir)/tst_uuid.c
+ $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
+
tst_uuid: tst_uuid.o $(LIBUUID)
$(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(LIBUUID)
diff --git a/lib/uuid/clear.c b/lib/uuid/clear.c
index 5127e01..32e26d4 100644
--- a/lib/uuid/clear.c
+++ b/lib/uuid/clear.c
@@ -1,7 +1,16 @@
/*
* clear.c -- Clear a UUID
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
*/
+#include "string.h"
+
#include "uuidP.h"
void uuid_clear(uuid_t uu)
diff --git a/lib/uuid/compare.c b/lib/uuid/compare.c
index 44052c3..7bca4fa 100644
--- a/lib/uuid/compare.c
+++ b/lib/uuid/compare.c
@@ -2,6 +2,13 @@
* compare.c --- compare whether or not two UUID's are the same
*
* Returns 0 if the two UUID's are different, and 1 if they are the same.
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
*/
#include "uuidP.h"
diff --git a/lib/uuid/copy.c b/lib/uuid/copy.c
index 739e2dd..5d0efc4 100644
--- a/lib/uuid/copy.c
+++ b/lib/uuid/copy.c
@@ -1,5 +1,12 @@
/*
* copy.c --- copy UUIDs
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
*/
#include "uuidP.h"
diff --git a/lib/uuid/dll/jump.funcs b/lib/uuid/dll/jump.funcs
new file mode 100644
index 0000000..cd75bb8
--- /dev/null
+++ b/lib/uuid/dll/jump.funcs
@@ -0,0 +1,9 @@
+00000000 T _uuid_clear libuuid clear
+00000000 T _uuid_compare libuuid compare
+00000000 T _uuid_copy libuuid copy
+00000000 T _uuid_generate libuuid gen_uuid
+00000000 T _uuid_is_null libuuid isnull
+00000000 T _uuid_pack libuuid pack
+00000000 T _uuid_parse libuuid parse
+00000000 T _uuid_unpack libuuid unpack
+00000000 T _uuid_unparse libuuid unparse
diff --git a/lib/uuid/dll/jump.ignore b/lib/uuid/dll/jump.ignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/uuid/dll/jump.ignore
diff --git a/lib/uuid/dll/jump.import b/lib/uuid/dll/jump.import
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/uuid/dll/jump.import
diff --git a/lib/uuid/dll/jump.params b/lib/uuid/dll/jump.params
new file mode 100644
index 0000000..efd3513
--- /dev/null
+++ b/lib/uuid/dll/jump.params
@@ -0,0 +1,6 @@
+Name=libuuid
+Text=0x67900000
+Data=0x00000000
+Jump=0x00001000
+GOT=0x00001000
+Version=0.0.0
diff --git a/lib/uuid/dll/jump.undefs b/lib/uuid/dll/jump.undefs
new file mode 100644
index 0000000..1fa6c91
--- /dev/null
+++ b/lib/uuid/dll/jump.undefs
@@ -0,0 +1 @@
+67903014 D __NEEDS_SHRLIB_libc_4
diff --git a/lib/uuid/dll/jump.vars b/lib/uuid/dll/jump.vars
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/uuid/dll/jump.vars
diff --git a/lib/uuid/gen_uuid.c b/lib/uuid/gen_uuid.c
index 8eaab4a..a0c815b 100644
--- a/lib/uuid/gen_uuid.c
+++ b/lib/uuid/gen_uuid.c
@@ -1,5 +1,12 @@
/*
* gen_uuid.c --- generate a DCE-compatible uuid
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
*/
#ifdef HAVE_UNISTD_H
@@ -185,8 +192,15 @@
__u32 clock_mid;
if (!has_init) {
- if (get_node_id(node_id) <= 0)
+ if (get_node_id(node_id) <= 0) {
get_random_bytes(node_id, 6);
+ /*
+ * Set multicast bit, to prevent conflicts
+ * with IEEE 802 addresses obtained from
+ * network cards
+ */
+ node_id[0] |= 0x80;
+ }
has_init = 1;
}
get_clock(&clock_mid, &uu.time_low, &uu.clock_seq);
diff --git a/lib/uuid/isnull.c b/lib/uuid/isnull.c
index f72e8fb..43b81f8 100644
--- a/lib/uuid/isnull.c
+++ b/lib/uuid/isnull.c
@@ -1,5 +1,12 @@
/*
* isnull.c --- Check whether or not the UUID is null
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
*/
#include "uuidP.h"
diff --git a/lib/uuid/pack.c b/lib/uuid/pack.c
index 476b7a1..c4d03c8 100644
--- a/lib/uuid/pack.c
+++ b/lib/uuid/pack.c
@@ -1,7 +1,15 @@
/*
* Internal routine for packing UUID's
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
*/
+#include <string.h>
#include "uuidP.h"
void uuid_pack(struct uuid *uu, uuid_t ptr)
diff --git a/lib/uuid/parse.c b/lib/uuid/parse.c
index ce3f88d..580c1fc 100644
--- a/lib/uuid/parse.c
+++ b/lib/uuid/parse.c
@@ -1,8 +1,17 @@
/*
* parse.c --- UUID parsing
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
*/
+#include <stdlib.h>
#include <stdio.h>
+#include <ctype.h>
#include "uuidP.h"
diff --git a/lib/uuid/tst_uuid.c b/lib/uuid/tst_uuid.c
index 068eea8..c60e9f8 100644
--- a/lib/uuid/tst_uuid.c
+++ b/lib/uuid/tst_uuid.c
@@ -1,3 +1,14 @@
+/*
+ * tst_uuid.c --- test program from the UUID library
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
+ */
+
#include <stdio.h>
#include <linux/ext2_fs.h>
diff --git a/lib/uuid/unpack.c b/lib/uuid/unpack.c
index 406587d..97a9dd8 100644
--- a/lib/uuid/unpack.c
+++ b/lib/uuid/unpack.c
@@ -1,7 +1,15 @@
/*
* Internal routine for unpacking UUID
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
*/
+#include <string.h>
#include "uuidP.h"
void uuid_unpack(uuid_t in, struct uuid *uu)
diff --git a/lib/uuid/unparse.c b/lib/uuid/unparse.c
index 32f7995..ab904bc 100644
--- a/lib/uuid/unparse.c
+++ b/lib/uuid/unparse.c
@@ -1,5 +1,12 @@
/*
- * uuid_to_str.c -- convert a UUID to string
+ * unparse.c -- convert a UUID to string
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
*/
#include <stdio.h>
diff --git a/lib/uuid/uuid.h b/lib/uuid/uuid.h
index 9568c03..08f924c 100644
--- a/lib/uuid/uuid.h
+++ b/lib/uuid/uuid.h
@@ -1,5 +1,12 @@
/*
* Public include file for the UUID library
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
*/
typedef unsigned char uuid_t[16];
diff --git a/lib/uuid/uuidP.h b/lib/uuid/uuidP.h
index 0ef9261..69f9af9 100644
--- a/lib/uuid/uuidP.h
+++ b/lib/uuid/uuidP.h
@@ -1,5 +1,12 @@
/*
* uuid.h -- private header file for uuids
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
*/
#include <sys/types.h>