diff --git a/AUTHORS b/AUTHORS index 2bccd7e..4b673e8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1 @@ -Charles Wyble + Charles Wyble diff --git a/cole/Makefile.am b/cole/Makefile.am index 339d48e..6d50db5 100644 --- a/cole/Makefile.am +++ b/cole/Makefile.am @@ -3,6 +3,6 @@ EXTRA_DIST = README-cole README-CVS DOWNLOAD ChangeLog ChangeLog-from1to2 TODO THANKS AUTHORS BUGS doc/* examples/* utils/* noinst_LIBRARIES = libcole.a -libcole_a_SOURCES = cole.c internal.c oledecod.c olecod.c support.c version.c internal.h support.h +libcole_a_SOURCES = cole.c internal.c oledecod.c olecod.c support.c version.c internal.h support.h AM_CFLAGS = -Wall -Wcast-align -Wpointer-arith diff --git a/cole/Makefile.in b/cole/Makefile.in index f08b78b..c7d1e12 100644 --- a/cole/Makefile.in +++ b/cole/Makefile.in @@ -77,7 +77,7 @@ VERSION = @VERSION@ EXTRA_DIST = README-cole README-CVS DOWNLOAD ChangeLog ChangeLog-from1to2 TODO THANKS AUTHORS BUGS doc/* examples/* utils/* noinst_LIBRARIES = libcole.a -libcole_a_SOURCES = cole.c internal.c oledecod.c olecod.c support.c version.c internal.h support.h +libcole_a_SOURCES = cole.c internal.c oledecod.c olecod.c support.c version.c internal.h support.h AM_CFLAGS = -Wall -Wcast-align -Wpointer-arith mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h diff --git a/cole/cole.c b/cole/cole.c index 3bbf872..4a656d5 100644 --- a/cole/cole.c +++ b/cole/cole.c @@ -57,6 +57,7 @@ cole_perror (const char *s, COLERRNO colerrno) break; case COLE_EOPENFILE: fprintf (stderr, "cole - Cannot open the file\n"); + exit(1); break; case COLE_ENOFILESYSTEM: fprintf (stderr, "cole - The file is not a OLE2 file\n"); diff --git a/config.h.in b/config.h.in index cea458d..e339b2e 100644 --- a/config.h.in +++ b/config.h.in @@ -51,8 +51,6 @@ /* Define if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Version number of package */ -#undef VERSION /* Define if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ diff --git a/config.log b/config.log index 9d75946..a856b00 100644 --- a/config.log +++ b/config.log @@ -1,3 +1,331 @@ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by configure, which was +generated by GNU Autoconf 2.50. Invocation command line was + + $ ./configure + +## ---------- ## +## Platform. ## +## ---------- ## + +hostname = moses +uname -m = i686 +uname -r = 2.4.5 +uname -s = Linux +uname -v = #19 Wed Jan 30 12:05:21 PST 2002 + +/usr/bin/uname -p = unknown +/bin/uname -X = unknown + +/bin/arch = i686 +/usr/bin/arch -k = unknown +/usr/convex/getsysinfo = unknown +hostinfo = unknown +/bin/machine = unknown +/usr/bin/oslevel = unknown +/bin/universe = unknown + +PATH = /usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/games:. + +## ------------ ## +## Core tests. ## +## ------------ ## + +configure:921: PATH=".;."; conftest.sh +./configure: conftest.sh: command not found +configure:924: $? = 127 +configure:964: checking build system type +configure:982: result: i686-pc-linux-gnu +configure:989: checking host system type +configure:1003: result: i686-pc-linux-gnu +configure:1028: checking for a BSD compatible install +configure:1077: result: /usr/bin/ginstall -c +configure:1088: checking whether build environment is sane +configure:1131: result: yes +configure:1152: checking whether make sets ${MAKE} +configure:1172: result: yes +configure:1200: checking for working aclocal +configure:1207: result: found +configure:1215: checking for working autoconf +configure:1222: result: found +configure:1230: checking for working automake +configure:1237: result: found +configure:1245: checking for working autoheader +configure:1252: result: found +configure:1260: checking for working makeinfo +configure:1267: result: found +configure:1322: checking for gcc +configure:1337: found /usr/bin/gcc +configure:1345: result: gcc +configure:1589: checking for C compiler default output +configure:1592: gcc conftest.c >&5 +configure:1595: $? = 0 +configure:1618: result: a.out +configure:1623: checking whether the C compiler works +configure:1629: ./a.out +configure:1632: $? = 0 +configure:1647: result: yes +configure:1654: checking whether we are cross compiling +configure:1656: result: no +configure:1659: checking for executable suffix +configure:1661: gcc -o conftest conftest.c >&5 +configure:1664: $? = 0 +configure:1686: result: +configure:1692: checking for object suffix +configure:1710: gcc -c conftest.c >&5 +configure:1713: $? = 0 +configure:1732: result: o +configure:1736: checking whether we are using the GNU C compiler +configure:1757: gcc -c conftest.c >&5 +configure:1760: $? = 0 +configure:1763: test -s conftest.o +configure:1766: $? = 0 +configure:1778: result: yes +configure:1784: checking whether gcc accepts -g +configure:1802: gcc -c -g conftest.c >&5 +configure:1805: $? = 0 +configure:1808: test -s conftest.o +configure:1811: $? = 0 +configure:1821: result: yes +configure:1848: gcc -c -g -O2 conftest.c >&5 +conftest.c:2: parse error before `me' +configure:1851: $? = 1 +configure: failed program was: +#ifndef __cplusplus + choke me +#endif +configure:1984: checking for ranlib +configure:1999: found /usr/bin/ranlib +configure:2008: result: ranlib +configure:2020: checking for strerror in -lcposix +configure:2047: gcc -o conftest -g -O2 conftest.c -lcposix >&5 +/usr/i386-slackware-linux/bin/ld: cannot find -lcposix +collect2: ld returned 1 exit status +configure:2050: $? = 1 +configure: failed program was: +#line 2028 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char strerror (); +int +main () +{ +strerror (); + ; + return 0; +} +configure:2067: result: no +configure:2078: checking how to run the C preprocessor +configure:2105: gcc -E conftest.c +configure:2111: $? = 0 +configure:2138: gcc -E conftest.c +configure:2135: ac_nonexistent.h: No such file or directory +configure:2144: $? = 1 +configure: failed program was: +#line 2134 "configure" +#include "confdefs.h" +#include +configure:2181: result: gcc -E +configure:2196: gcc -E conftest.c +configure:2202: $? = 0 +configure:2229: gcc -E conftest.c +configure:2226: ac_nonexistent.h: No such file or directory +configure:2235: $? = 1 +configure: failed program was: +#line 2225 "configure" +#include "confdefs.h" +#include +configure:2277: checking for malloc.h +configure:2287: gcc -E conftest.c +configure:2293: $? = 0 +configure:2312: result: yes +configure:2322: checking for gcc option to accept ANSI C +configure:2379: gcc -c -g -O2 conftest.c >&5 +configure:2382: $? = 0 +configure:2385: test -s conftest.o +configure:2388: $? = 0 +configure:2405: result: none needed +configure:2413: checking for an ANSI C-conforming const +configure:2477: gcc -c -g -O2 conftest.c >&5 +configure:2480: $? = 0 +configure:2483: test -s conftest.o +configure:2486: $? = 0 +configure:2496: result: yes +configure:2506: checking for ANSI C header files +configure:2520: gcc -E conftest.c +configure:2526: $? = 0 +configure:2613: gcc -o conftest -g -O2 conftest.c >&5 +configure:2616: $? = 0 +configure:2618: ./conftest +configure:2621: $? = 0 +configure:2634: result: yes +configure:2647: checking for stdlib.h +configure:2657: gcc -E conftest.c +configure:2663: $? = 0 +configure:2682: result: yes +configure:2647: checking for string.h +configure:2657: gcc -E conftest.c +configure:2663: $? = 0 +configure:2682: result: yes +configure:2647: checking for memory.h +configure:2657: gcc -E conftest.c +configure:2663: $? = 0 +configure:2682: result: yes +configure:2647: checking for strings.h +configure:2657: gcc -E conftest.c +configure:2663: $? = 0 +configure:2682: result: yes +configure:2647: checking for inttypes.h +configure:2657: gcc -E conftest.c +configure:2663: $? = 0 +configure:2682: result: yes +configure:2647: checking for unistd.h +configure:2657: gcc -E conftest.c +configure:2663: $? = 0 +configure:2682: result: yes +configure:2692: checking for size_t +configure:2713: gcc -c -g -O2 conftest.c >&5 +configure:2716: $? = 0 +configure:2719: test -s conftest.o +configure:2722: $? = 0 +configure:2732: result: yes +configure:2744: checking for unsigned char +configure:2765: gcc -c -g -O2 conftest.c >&5 +configure:2768: $? = 0 +configure:2771: test -s conftest.o +configure:2774: $? = 0 +configure:2784: result: yes +configure:2787: checking size of unsigned char +configure:2951: gcc -o conftest -g -O2 conftest.c >&5 +configure:2954: $? = 0 +configure:2956: ./conftest +configure:2959: $? = 0 +configure:2975: result: 1 +configure:2981: checking for unsigned short +configure:3002: gcc -c -g -O2 conftest.c >&5 +configure:3005: $? = 0 +configure:3008: test -s conftest.o +configure:3011: $? = 0 +configure:3021: result: yes +configure:3024: checking size of unsigned short +configure:3188: gcc -o conftest -g -O2 conftest.c >&5 +configure:3191: $? = 0 +configure:3193: ./conftest +configure:3196: $? = 0 +configure:3212: result: 2 +configure:3218: checking for unsigned int +configure:3239: gcc -c -g -O2 conftest.c >&5 +configure:3242: $? = 0 +configure:3245: test -s conftest.o +configure:3248: $? = 0 +configure:3258: result: yes +configure:3261: checking size of unsigned int +configure:3425: gcc -o conftest -g -O2 conftest.c >&5 +configure:3428: $? = 0 +configure:3430: ./conftest +configure:3433: $? = 0 +configure:3449: result: 4 +configure:3455: checking for unsigned long +configure:3476: gcc -c -g -O2 conftest.c >&5 +configure:3479: $? = 0 +configure:3482: test -s conftest.o +configure:3485: $? = 0 +configure:3495: result: yes +configure:3498: checking size of unsigned long +configure:3662: gcc -o conftest -g -O2 conftest.c >&5 +configure:3665: $? = 0 +configure:3667: ./conftest +configure:3670: $? = 0 +configure:3686: result: 4 +configure:3692: checking for unsigned long long +configure:3713: gcc -c -g -O2 conftest.c >&5 +configure:3716: $? = 0 +configure:3719: test -s conftest.o +configure:3722: $? = 0 +configure:3732: result: yes +configure:3735: checking size of unsigned long long +configure:3899: gcc -o conftest -g -O2 conftest.c >&5 +configure:3902: $? = 0 +configure:3904: ./conftest +configure:3907: $? = 0 +configure:3923: result: 8 +configure:3929: checking for float +configure:3950: gcc -c -g -O2 conftest.c >&5 +configure:3953: $? = 0 +configure:3956: test -s conftest.o +configure:3959: $? = 0 +configure:3969: result: yes +configure:3972: checking size of float +configure:4136: gcc -o conftest -g -O2 conftest.c >&5 +configure:4139: $? = 0 +configure:4141: ./conftest +configure:4144: $? = 0 +configure:4160: result: 4 +configure:4166: checking for double +configure:4187: gcc -c -g -O2 conftest.c >&5 +configure:4190: $? = 0 +configure:4193: test -s conftest.o +configure:4196: $? = 0 +configure:4206: result: yes +configure:4209: checking size of double +configure:4373: gcc -o conftest -g -O2 conftest.c >&5 +configure:4376: $? = 0 +configure:4378: ./conftest +configure:4381: $? = 0 +configure:4397: result: 8 +configure:4403: checking for long double +configure:4424: gcc -c -g -O2 conftest.c >&5 +configure:4427: $? = 0 +configure:4430: test -s conftest.o +configure:4433: $? = 0 +configure:4443: result: yes +configure:4446: checking size of long double +configure:4610: gcc -o conftest -g -O2 conftest.c >&5 +configure:4613: $? = 0 +configure:4615: ./conftest +configure:4618: $? = 0 +configure:4634: result: 12 +configure:4640: checking whether byte ordering is bigendian +configure:4665: gcc -c -g -O2 conftest.c >&5 +configure:4668: $? = 0 +configure:4671: test -s conftest.o +configure:4674: $? = 0 +configure:4695: gcc -c -g -O2 conftest.c >&5 +configure: In function `main': +configure:4686: `not' undeclared (first use in this function) +configure:4686: (Each undeclared identifier is reported only once +configure:4686: for each function it appears in.) +configure:4686: parse error before `big' +configure:4698: $? = 1 +configure: failed program was: +#line 4678 "configure" +#include "confdefs.h" +#include +#include + +int +main () +{ +#if BYTE_ORDER != BIG_ENDIAN + not big endian +#endif + + ; + return 0; +} +configure:4762: result: no +configure:4810: checking for strip +configure:4825: found /usr/bin/strip +configure:4833: result: strip +configure:4930: creating ./config.status ## ----------------------- ## ## Running config.status. ## @@ -7,7 +335,103 @@ This file was extended by config.status 2.50, executed with > ./config.status on moses +config.status:5395: creating Makefile +config.status:5395: creating cole/Makefile +config.status:5395: creating cole/version.c +config.status:5395: creating cole/cole.h +config.status:5395: creating xlhtml/Makefile config.status:5395: creating ppthtml/Makefile +config.status:5487: creating config.h +configure:5709: result: Configured xlhtml/xlhtml release 0.4.9.2 + +## ----------------- ## +## Cache variables. ## +## ----------------- ## + +ac_cv_build=i686-pc-linux-gnu +ac_cv_build_alias=i686-pc-linux +ac_cv_c_bigendian=no +ac_cv_c_compiler_gnu=yes +ac_cv_c_const=yes +ac_cv_env_CC_set= +ac_cv_env_CC_value= +ac_cv_env_CFLAGS_set= +ac_cv_env_CFLAGS_value= +ac_cv_env_CPPFLAGS_set= +ac_cv_env_CPPFLAGS_value= +ac_cv_env_CPP_set= +ac_cv_env_CPP_value= +ac_cv_env_LDFLAGS_set= +ac_cv_env_LDFLAGS_value= +ac_cv_env_build_alias_set= +ac_cv_env_build_alias_value= +ac_cv_env_host_alias_set= +ac_cv_env_host_alias_value= +ac_cv_env_target_alias_set= +ac_cv_env_target_alias_value= +ac_cv_header_inttypes_h=yes +ac_cv_header_malloc_h=yes +ac_cv_header_memory_h=yes +ac_cv_header_stdc=yes +ac_cv_header_stdlib_h=yes +ac_cv_header_string_h=yes +ac_cv_header_strings_h=yes +ac_cv_header_unistd_h=yes +ac_cv_host=i686-pc-linux-gnu +ac_cv_host_alias=i686-pc-linux +ac_cv_lib_cposix_strerror=no +ac_cv_objext=o +ac_cv_path_install=$'/usr/bin/ginstall -c' +ac_cv_prog_CPP=$'gcc -E' +ac_cv_prog_ac_ct_CC=gcc +ac_cv_prog_ac_ct_RANLIB=ranlib +ac_cv_prog_ac_ct_STRIP=strip +ac_cv_prog_cc_g=yes +ac_cv_prog_cc_stdc= +ac_cv_prog_make_make_set=yes +ac_cv_sizeof_double=8 +ac_cv_sizeof_float=4 +ac_cv_sizeof_long_double=12 +ac_cv_sizeof_unsigned_char=1 +ac_cv_sizeof_unsigned_int=4 +ac_cv_sizeof_unsigned_long=4 +ac_cv_sizeof_unsigned_long_long=8 +ac_cv_sizeof_unsigned_short=2 +ac_cv_type_double=yes +ac_cv_type_float=yes +ac_cv_type_long_double=yes +ac_cv_type_size_t=yes +ac_cv_type_unsigned_char=yes +ac_cv_type_unsigned_int=yes +ac_cv_type_unsigned_long=yes +ac_cv_type_unsigned_long_long=yes +ac_cv_type_unsigned_short=yes + +## ------------ ## +## confdefs.h. ## +## ------------ ## + +#define PACKAGE "xlhtml/xlhtml" +#define VERSION "0.4.9.2" +#define HAVE_MALLOC_H 1 +#define STDC_HEADERS 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRING_H 1 +#define HAVE_MEMORY_H 1 +#define HAVE_STRINGS_H 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_UNISTD_H 1 +#define SIZEOF_UNSIGNED_CHAR 1 +#define SIZEOF_UNSIGNED_SHORT 2 +#define SIZEOF_UNSIGNED_INT 4 +#define SIZEOF_UNSIGNED_LONG 4 +#define SIZEOF_UNSIGNED_LONG_LONG 8 +#define SIZEOF_FLOAT 4 +#define SIZEOF_DOUBLE 8 +#define SIZEOF_LONG_DOUBLE 12 + + +configure: exit 0 ## ----------------------- ## ## Running config.status. ## @@ -27,4 +451,14 @@ This file was extended by config.status 2.50, executed with > ./config.status on moses -config.status:5395: creating cole/Makefile +config.status:5395: creating xlhtml/Makefile + +## ----------------------- ## +## Running config.status. ## +## ----------------------- ## + +This file was extended by config.status 2.50, executed with + > ./config.status +on moses + +config.status:5487: creating config.h diff --git a/ppthtml/Makefile.am b/ppthtml/Makefile.am index 07810c6..42e71de 100644 --- a/ppthtml/Makefile.am +++ b/ppthtml/Makefile.am @@ -11,4 +11,3 @@ bin_PROGRAMS = ppthtml LDADD = ../cole/libcole.a ppthtml_SOURCES = ppthtml.c AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith - diff --git a/ppthtml/ppthtml.c b/ppthtml/ppthtml.c index 35fa42e..51f6367 100644 --- a/ppthtml/ppthtml.c +++ b/ppthtml/ppthtml.c @@ -30,6 +30,7 @@ #include #endif + #include #include /* for strcpy() */ #include /* For isprint */ @@ -198,7 +199,7 @@ void dump_file(COLEDIRENT *cde, void *_info) printf(" 
\n"); /* Output Credit */ - printf("
Created with pptHtml %s
\n", PRGVER); + printf("
Created with pptHtml
\n" ); /* Output Tail */ printf("\n"); diff --git a/xlhtml/ChangeLog b/xlhtml/ChangeLog index 6250f88..7f4fb6b 100644 --- a/xlhtml/ChangeLog +++ b/xlhtml/ChangeLog @@ -1,6 +1,10 @@ xlHtml ChangeLog +0.4.9.4 + *Fixed some memory leaks + *Increased file name limit to 256 characters + 0.4.9.3 03/19/02 *Began code modularization *Changed pointers to xlhtml web site diff --git a/xlhtml/support.c b/xlhtml/support.c index b1213b6..4f16f49 100644 --- a/xlhtml/support.c +++ b/xlhtml/support.c @@ -10,7 +10,7 @@ void print_version(void) { printf("xlhtml %s \nCopyright (c) 1999-2002, Charles Wyble\n" "Released under GPL.\n", VERSION ); - exit(1); + exit(0); } void display_usage(void) diff --git a/xlhtml/xlhtml.c b/xlhtml/xlhtml.c index 3fc974f..d9781fa 100644 --- a/xlhtml/xlhtml.c +++ b/xlhtml/xlhtml.c @@ -368,12 +368,10 @@ int main (int argc, char **argv) if (strcmp(filename, "-v") == 0) { print_version(); - exit(0); } if (strcmp(filename, "--version") == 0) { print_version(); - exit(0); } if (strcmp(filename, "--help") == 0) @@ -516,13 +514,18 @@ int main (int argc, char **argv) free(ws_array[i]); } } + + free(xf_array); + free(font_array); + free(f_cnt); + free(str_array); + free(ws_array); for (i=0; i<(int)max_xformats; i++) { if (xf_array[i]) free(xf_array[i]); } - free(xf_array); if (numCustomColors) { @@ -540,8 +543,6 @@ int main (int argc, char **argv) if (lastUpdated) free(lastUpdated); - free(str_array); - free(ws_array); return 0; } @@ -4561,3 +4562,4 @@ void OutputPartialTableAscii(void) printf("\n\n"); /* End of Table 2 LF-CR */ } } + diff --git a/xlhtml/xlhtml.h b/xlhtml/xlhtml.h index 2f11f74..9d3585b 100644 --- a/xlhtml/xlhtml.h +++ b/xlhtml/xlhtml.h @@ -121,3 +121,4 @@ static char SectionName[2][12] = /* The section of the Excel Stream where the wo "/Workbook", /*!< Excel 97 & 2000 */ "/Book" /*!< Everything else ? */ }; +