1 --- db2/clib/getlong.c.jj Tue Jun 9 17:02:31 1998
2 +++ db2/clib/getlong.c Thu Apr 20 13:53:38 2000
3 @@ -34,7 +34,7 @@ get_long(p, min, max, storep)
9 val = strtol(p, &end, 10);
10 if ((val == LONG_MIN || val == LONG_MAX) && errno == ERANGE)
12 --- db2/db185/db185.c.jj Tue Jun 9 17:03:04 1998
13 +++ db2/db185/db185.c Thu Apr 20 14:00:23 2000
14 @@ -205,7 +205,7 @@ __dbopen(file, oflags, mode, type, openi
16 (void)dbp->close(dbp, 0);
18 - __set_errno(s_errno);
23 @@ -213,7 +213,7 @@ __dbopen(file, oflags, mode, type, openi
26 einval: __db_free(db185p);
27 - __set_errno(EINVAL);
31 weak_alias (__dbopen, dbopen)
32 @@ -226,7 +226,7 @@ db185_close(db185p)
34 dbp = (DB *)db185p->internal;
36 - __set_errno(dbp->close(dbp, 0));
37 + errno = dbp->close(dbp, 0);
41 @@ -251,9 +251,9 @@ db185_del(db185p, key185, flags)
42 if (flags & ~R_CURSOR)
45 - __set_errno(db185p->dbc->c_del(db185p->dbc, 0));
46 + errno = db185p->dbc->c_del(db185p->dbc, 0);
48 - __set_errno(dbp->del(dbp, NULL, &key, 0));
49 + errno = dbp->del(dbp, NULL, &key, 0);
53 @@ -263,7 +263,7 @@ db185_del(db185p, key185, flags)
57 -einval: __set_errno(EINVAL);
58 +einval: errno = EINVAL;
62 @@ -276,7 +276,7 @@ db185_fd(db185p)
64 dbp = (DB *)db185p->internal;
66 - return ((__set_errno(dbp->fd(dbp, &fd))) == 0 ? fd : -1);
67 + return ((errno = dbp->fd(dbp, &fd)) == 0 ? fd : -1);
71 @@ -301,7 +301,7 @@ db185_get(db185p, key185, data185, flags
75 - switch (__set_errno(dbp->get(dbp, NULL, &key, &data, 0))) {
76 + switch (errno = dbp->get(dbp, NULL, &key, &data, 0)) {
78 data185->data = data.data;
79 data185->size = data.size;
80 @@ -311,7 +311,7 @@ db185_get(db185p, key185, data185, flags
84 -einval: __set_errno(EINVAL);
85 +einval: errno = EINVAL;
89 @@ -338,46 +338,46 @@ db185_put(db185p, key185, data185, flags
93 - __set_errno(dbp->put(dbp, NULL, &key, &data, 0));
94 + errno = dbp->put(dbp, NULL, &key, &data, 0);
98 - db185p->dbc->c_put(db185p->dbc, &key, &data, DB_CURRENT));
100 + db185p->dbc->c_put(db185p->dbc, &key, &data, DB_CURRENT);
104 if (dbp->type != DB_RECNO)
107 - if ((__set_errno(dbp->cursor(dbp, NULL, &dbcp_put))) != 0)
108 + if ((errno = dbp->cursor(dbp, NULL, &dbcp_put)) != 0)
111 - dbcp_put->c_get(dbcp_put, &key, &data, DB_SET))) != 0) {
113 + dbcp_put->c_get(dbcp_put, &key, &data, DB_SET)) != 0) {
115 (void)dbcp_put->c_close(dbcp_put);
116 - __set_errno(s_errno);
120 memset(&data, 0, sizeof(data));
121 data.data = data185->data;
122 data.size = data185->size;
123 - __set_errno(dbcp_put->c_put(dbcp_put,
124 - &key, &data, flags == R_IAFTER ? DB_AFTER : DB_BEFORE));
125 + errno = dbcp_put->c_put(dbcp_put,
126 + &key, &data, flags == R_IAFTER ? DB_AFTER : DB_BEFORE);
128 (void)dbcp_put->c_close(dbcp_put);
129 - __set_errno(s_errno);
133 - __set_errno(dbp->put(dbp, NULL, &key, &data, DB_NOOVERWRITE));
134 + errno = dbp->put(dbp, NULL, &key, &data, DB_NOOVERWRITE);
137 if (dbp->type != DB_BTREE && dbp->type != DB_RECNO)
140 - if ((__set_errno(dbp->put(dbp, NULL, &key, &data, 0))) != 0)
141 + if ((errno = dbp->put(dbp, NULL, &key, &data, 0)) != 0)
143 - __set_errno(db185p->dbc->c_get(db185p->dbc,
144 - &key, &data, DB_SET_RANGE));
145 + errno = db185p->dbc->c_get(db185p->dbc,
146 + &key, &data, DB_SET_RANGE);
150 @@ -393,7 +393,7 @@ db185_put(db185p, key185, data185, flags
154 -einval: __set_errno(EINVAL);
155 +einval: errno = EINVAL;
159 @@ -438,8 +438,8 @@ db185_seq(db185p, key185, data185, flags
163 - switch (__set_errno(db185p->dbc->c_get(db185p->dbc,
164 - &key, &data, flags))) {
165 + switch (errno = db185p->dbc->c_get(db185p->dbc,
166 + &key, &data, flags)) {
168 key185->data = key.data;
169 key185->size = key.size;
170 @@ -451,7 +451,7 @@ db185_seq(db185p, key185, data185, flags
174 -einval: __set_errno(EINVAL);
175 +einval: errno = EINVAL;
179 @@ -479,8 +479,8 @@ db185_sync(db185p, flags)
183 - return ((__set_errno(dbp->sync(dbp, 0))) == 0 ? 0 : -1);
184 + return ((errno = dbp->sync(dbp, 0)) == 0 ? 0 : -1);
186 -einval: __set_errno(EINVAL);
187 +einval: errno = EINVAL;
190 --- db2/dbm/dbm.c.jj Tue Jun 9 17:03:09 1998
191 +++ db2/dbm/dbm.c Thu Apr 20 13:58:27 2000
192 @@ -255,7 +255,7 @@ __db_ndbm_fetch(db, key)
196 - __set_errno (ret == DB_NOTFOUND ? ENOENT : ret);
197 + errno = (ret == DB_NOTFOUND ? ENOENT : ret);
201 @@ -290,7 +290,7 @@ __db_ndbm_firstkey(db)
205 - __set_errno (ret == DB_NOTFOUND ? ENOENT : ret);
206 + errno = (ret == DB_NOTFOUND ? ENOENT : ret);
210 @@ -324,7 +324,7 @@ __db_ndbm_nextkey(db)
214 - __set_errno (ret == DB_NOTFOUND ? ENOENT : ret);
215 + errno = (ret == DB_NOTFOUND ? ENOENT : ret);
219 --- db2/Versions.jj Fri Aug 21 19:20:21 1998
220 +++ db2/Versions Wed Apr 19 18:41:45 2000
229 @@ -7,8 +7,11 @@ libdb {
230 dbm_clearerr; dbm_close; dbm_delete; dbm_dirfno; dbm_error;
231 dbm_fetch; dbm_firstkey; dbminit; dbm_nextkey; dbm_open;
232 dbm_pagfno; dbm_store;
241 # Internal functions used by db maintenance programs
242 __bam_init_print; __bam_pgin; __bam_pgout;
243 @@ -50,5 +53,4 @@ libdb {
244 # compatibility interface for dbm
245 __db_dbm_delete; __db_dbm_fetch; __db_dbm_firstkey; __db_dbm_init;
246 __db_dbm_nextkey; __db_dbm_store;
250 --- db2/Makefile.jj Wed Aug 25 21:41:51 1999
251 +++ db2/Makefile Thu Apr 20 14:04:28 2000
253 # Boston, MA 02111-1307, USA.
256 -# Sub-makefile for libdb.
257 +# Makefile for libdb.
259 # The code is lifted straight from the db 2.3.12 distribution
260 # with minimal changes.
265 subdir-dirs = btree common db db185 dbm hash lock log mp mutex os txn \
266 progs/db_archive progs/db_checkpoint progs/db_deadlock \
267 progs/db_dump progs/db_dump185 progs/db_load progs/db_printlog \
268 @@ -32,23 +30,6 @@ subdir-dirs = btree common db db185 dbm
270 headers = db.h db_185.h
272 -distribute = db_int.h config.h compat.h clib/getlong.c btree/btree.src \
273 - db/db.src db185/db185_int.h hash/hash.src log/log.src \
274 - txn/txn.src README LICENSE \
275 - $(addprefix include/,btree.h btree_auto.h btree_ext.h \
276 - clib_ext.h common_ext.h cxx_int.h \
277 - db.h.src db_185.h.src db_am.h db_auto.h \
278 - db_cxx.h db_dispatch.h db_ext.h \
279 - db_int.h.src db_page.h db_shash.h db_swap.h \
280 - hash.h hash_auto.h hash_ext.h lock.h \
281 - lock_ext.h log.h log_auto.h log_ext.h \
282 - mp.h mp_ext.h mutex_ext.h os_ext.h queue.h \
283 - shqueue.h txn.h txn_auto.h txn_ext.h \
285 - $(addprefix mutex/,x86.gcc uts4.cc.s sparc.gcc parisc.hp \
286 - parisc.gcc alpha.gcc alpha.dec README \
287 - 68020.gcc tsl_parisc.s sco.cc)
289 vpath %.c $(subdir-dirs)
292 @@ -71,54 +52,39 @@ libdb-routines := bt_close bt_compare bt
293 mp_open mp_pr mp_region mp_sync mutex txn txn_auto \
296 -others := makedb db_dump185 db_archive db_checkpoint db_deadlock \
297 - db_dump db_load db_recover db_stat db_printlog
298 -install-bin := makedb db_dump185 db_archive db_checkpoint db_deadlock \
299 - db_dump db_load db_recover db_stat db_printlog
303 -CPPFLAGS += -I./include -include ./compat.h
305 -$(objpfx)db_checkpoint: $(objpfx)getlong.o
306 -$(objpfx)db_deadlock: $(objpfx)getlong.o
307 -$(objpfx)db_load: $(objpfx)getlong.o
309 -ifeq ($(build-shared),yes)
310 -$(objpfx)makedb: $(objpfx)libdb.so$(libdb.so-version)
311 -$(objpfx)db_dump185: $(common-objpfx)db/libdb1.so$(libdb1.so-version)
312 -$(objpfx)db_archive: $(objpfx)libdb.so$(libdb.so-version)
313 -$(objpfx)db_checkpoint: $(objpfx)libdb.so$(libdb.so-version)
314 -$(objpfx)db_deadlock: $(objpfx)libdb.so$(libdb.so-version)
315 -$(objpfx)db_dump: $(objpfx)libdb.so$(libdb.so-version)
316 -$(objpfx)db_load: $(objpfx)libdb.so$(libdb.so-version)
317 -$(objpfx)db_printlog: $(objpfx)libdb.so$(libdb.so-version)
318 -$(objpfx)db_recover: $(objpfx)libdb.so$(libdb.so-version)
319 -$(objpfx)db_stat: $(objpfx)libdb.so$(libdb.so-version)
321 -$(objpfx)makedb: $(objpfx)libdb.a
322 -$(objpfx)db_dump185: $(common-objpfx)db/libdb1.a
323 -$(objpfx)db_archive: $(objpfx)libdb.a
324 -$(objpfx)db_checkpoint: $(objpfx)libdb.a
325 -$(objpfx)db_deadlock: $(objpfx)libdb.a
326 -$(objpfx)db_dump: $(objpfx)libdb.a
327 -$(objpfx)db_load: $(objpfx)libdb.a
328 -$(objpfx)db_printlog: $(objpfx)libdb.a
329 -$(objpfx)db_recover: $(objpfx)libdb.a
330 -$(objpfx)db_stat: $(objpfx)libdb.a
333 -# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
334 -$(objpfx)libdb.so: $(common-objpfx)libc.so
336 -ifeq ($(build-static),yes)
337 -subdir_install: $(inst_libdir)/libndbm.a
338 -$(inst_libdir)/libndbm.a: $(inst_libdir)/libdb.a $(+force)
342 -ifeq ($(build-shared),yes)
343 -subdir_install: $(inst_libdir)/libndbm.so
344 -$(inst_libdir)/libndbm.so: $(inst_libdir)/libdb.so $(+force)
347 +others := makedb db_archive \
348 + db_dump db_recover db_stat db_printlog
349 +others2 := db_checkpoint db_deadlock db_load
351 +CFLAGS += -I. -I./include -include ./compat.h
355 +all: libdb.a libdb.so$(libdb.so-version) $(extra-objs) $(others) $(others2)
358 + $(CC) $(CFLAGS) -c -g -o $@ $<
360 + $(CC) $(CFLAGS) -c -fpic -o $@ $<
362 +libdb.a: $(patsubst %,%.o,$(libdb-routines))
367 +libdb.so$(libdb.so-version): $(patsubst %,%.os,$(libdb-routines))
368 + $(CC) -Wl,-O1 -Wl,--version-script=Versions -Wl,-soname=libdb.so$(libdb.so-version) -shared -o $@ $^
372 + $(CC) -o $@ $< -L. -ldb
375 + $(CC) -o $@ $< $(extra-objs) -L. -ldb
378 + rm -f $(patsubst %,%.o,$(libdb-routines))
379 + rm -f $(patsubst %,%.os,$(libdb-routines))
380 + rm -f $(extra-objs) *~ $(others) $(others2)
381 + rm -f libdb.a libdb.so libdb.so$(libdb.so-version)
382 + rm -f $(patsubst %,%.o,$(others) $(others2))
383 --- db2/config.h.jj Tue Jun 9 17:02:06 1998
384 +++ db2/config.h Thu Apr 20 08:45:11 2000
386 /* Define if you have the <sys/time.h> header file. */
387 #define HAVE_SYS_TIME_H 1
389 -#include_next <config.h>
390 --- db2/compat.h.jj Mon Apr 20 20:01:29 1998
391 +++ db2/compat.h Thu Apr 20 13:15:37 2000
393 typedef loff_t offset_t;
395 extern int llseek (int fd, loff_t offset, int whence);
397 +#define weak_alias(original, alias) \
398 + asm (".weak " #alias "\n" #alias " = " #original);
399 --- db2/makedb.c.jj Mon Jan 4 13:30:30 1999
400 +++ db2/makedb.c Thu Apr 20 13:52:32 2000
403 #include <sys/stat.h>
405 -/* Get libc version number. */
406 -#include "../version.h"
408 -#define PACKAGE _libc_intl_domainname
410 /* If non-zero convert key to lower case. */
411 static int to_lowercase;
413 @@ -55,21 +50,21 @@ void (*argp_program_version_hook) (FILE
414 /* Definitions of arguments for argp functions. */
415 static const struct argp_option options[] =
417 - { "fold-case", 'f', NULL, 0, N_("Convert key to lower case") },
418 - { "output", 'o', N_("NAME"), 0, N_("Write output to file NAME") },
419 + { "fold-case", 'f', NULL, 0, "Convert key to lower case" },
420 + { "output", 'o', "NAME", 0, "Write output to file NAME" },
421 { "quiet", 'q', NULL, 0,
422 - N_("Do not print messages while building database") },
423 + "Do not print messages while building database" },
424 { "undo", 'u', NULL, 0,
425 - N_("Print content of database file, one entry a line") },
426 + "Print content of database file, one entry a line" },
427 { NULL, 0, NULL, 0, NULL }
430 /* Short description of program. */
431 -static const char doc[] = N_("Create simple DB database from textual input.");
432 +static const char doc[] = "Create simple DB database from textual input.";
434 /* Strings for arguments in help texts. */
435 -static const char args_doc[] = N_("\
436 -INPUT-FILE OUTPUT-FILE\n-o OUTPUT-FILE INPUT-FILE\n-u INPUT-FILE");
437 +static const char args_doc[] = "\
438 +INPUT-FILE OUTPUT-FILE\n-o OUTPUT-FILE INPUT-FILE\n-u INPUT-FILE";
440 /* Prototype for option handler. */
441 static error_t parse_opt __P ((int key, char *arg, struct argp_state *state));
442 @@ -97,6 +92,7 @@ main (argc, argv)
445 const char *input_name;
450 @@ -106,9 +102,6 @@ main (argc, argv)
451 /* Set locale via LC_ALL. */
452 setlocale (LC_ALL, "");
454 - /* Set the text message domain. */
455 - textdomain (_libc_intl_domainname);
457 /* Initialize local variables. */
460 @@ -122,8 +115,13 @@ main (argc, argv)
463 error (0, 0, gettext ("wrong number of arguments"));
464 + short_name = strrchr(argv[0], '/');
468 + short_name = argv[0];
469 argp_help (&argp, stdout, ARGP_HELP_SEE,
470 - program_invocation_short_name);
474 input_name = argv[remaining];
475 @@ -238,7 +236,7 @@ Report bugs using the `glibcbug' script
477 print_version (FILE *stream, struct argp_state *state)
479 - fprintf (stream, "makedb (GNU %s) %s\n", PACKAGE, VERSION);
480 + fprintf (stream, "makedb (from GNU libc 2.1.3)\n");
481 fprintf (stream, gettext ("\
482 Copyright (C) %s Free Software Foundation, Inc.\n\
483 This is free software; see the source for copying conditions. There is NO\n\