1 diff -Nur recode-3.6.orig/src/Makefile.am recode-3.6/src/Makefile.am
2 --- recode-3.6.orig/src/Makefile.am Wed Dec 6 17:36:12 2000
3 +++ recode-3.6/src/Makefile.am Sun Oct 27 10:56:18 2002
7 recode_SOURCES = main.c freeze.c mixed.c
8 -recode_LDADD = librecode.la ../lib/libreco.a
9 +recode_LDADD = librecode.la
11 librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c \
12 hash.c iconv.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c \
13 -recode.c request.c strip-pool.c task.c xmalloc.c $(C_STEPS)
14 +recode.c request.c strip-pool.c task.c $(C_STEPS)
15 librecode_la_LDFLAGS = -version-info 0:0:0
17 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/libiconv
18 diff -Nur recode-3.6.orig/src/main.c recode-3.6/src/main.c
19 --- recode-3.6.orig/src/main.c Wed Dec 6 20:44:59 2000
20 +++ recode-3.6/src/main.c Sun Oct 27 10:58:04 2002
25 - buffer = (char *) xmalloc ((size_t) (header_name - optarg));
26 + buffer = (char *) malloc ((size_t) (header_name - optarg));
27 if (*header_name == NUL)
29 for (counter = 0; optarg[counter] != '/'; counter++)
34 - rewritten_request = (char *) xmalloc (strlen (user_request) + 2);
35 + rewritten_request = (char *) malloc (strlen (user_request) + 2);
36 cursor2 = rewritten_request;
37 for (cursor = user_request; *cursor != ':'; cursor++)
39 diff -Nur recode-3.6.orig/src/quotearg.c recode-3.6/src/quotearg.c
40 --- recode-3.6.orig/src/quotearg.c Thu Aug 3 03:21:15 2000
41 +++ recode-3.6/src/quotearg.c Sun Oct 27 10:58:53 2002
44 #include <sys/types.h>
50 #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
52 clone_quoting_options (struct quoting_options *o)
54 struct quoting_options *p
55 - = (struct quoting_options *) xmalloc (sizeof (struct quoting_options));
56 + = (struct quoting_options *) malloc (sizeof (struct quoting_options));
57 *p = *(o ? o : &default_quoting_options);
61 size_t s = n1 * sizeof (struct slotvec);
62 if (! (0 < n1 && n1 == s / sizeof (struct slotvec)))
64 - slotvec = (struct slotvec *) xrealloc (slotvec, s);
65 + slotvec = (struct slotvec *) realloc (slotvec, s);
66 memset (slotvec + nslots, 0, (n1 - nslots) * sizeof (struct slotvec));
72 slotvec[n].size = size = qsize + 1;
73 - slotvec[n].val = val = xrealloc (val, size);
74 + slotvec[n].val = val = realloc (val, size);
75 quotearg_buffer (val, size, arg, (size_t) -1, options);