From ad99033ae4b71ae75e18fe255fcd1554afe1549d Mon Sep 17 00:00:00 2001 From: cvs2svn Date: Wed, 21 Nov 2001 19:35:52 +0000 Subject: [PATCH 1/9] This commit was manufactured by cvs2svn to create branch 'release_1_4_3_patches'. From 7b2892be7620c1c67616e1c88d164d24476c4eed Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Wed, 5 Mar 2008 15:01:25 -0800 Subject: [PATCH 2/9] Renamed reconf to autogen.sh --- reconf => autogen.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename reconf => autogen.sh (100%) diff --git a/reconf b/autogen.sh similarity index 100% rename from reconf rename to autogen.sh From 86f38819c0f34af90a7e0764cbcf9f92262ee441 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Wed, 5 Mar 2008 15:03:59 -0800 Subject: [PATCH 3/9] Added .gitignore files --- .gitignore | 18 ++++++++++++++++++ doc/.gitignore | 3 +++ src/.gitignore | 8 ++++++++ 3 files changed, 29 insertions(+) create mode 100644 .gitignore create mode 100644 doc/.gitignore create mode 100644 src/.gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..0163fc4e --- /dev/null +++ b/.gitignore @@ -0,0 +1,18 @@ +COPYING +INSTALL +Makefile +Makefile.in +NEWS +aclocal.m4 +config.cache +config.h +config.h.in +config.log +config.status +configure +depcomp +install-sh +libtool +missing +mkinstalldirs +stamp-h1 diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 00000000..71605d56 --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,3 @@ +Makefile +Makefile.in +report.sh diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 00000000..0d0ee5c5 --- /dev/null +++ b/src/.gitignore @@ -0,0 +1,8 @@ +.deps +.libs +Makefile +Makefile.in +grammar.c +grammar.h +scanner.c +tinyproxy From 625cecf49243e0f4462e61245de18d8864b2736e Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Wed, 12 Mar 2008 15:38:12 -0700 Subject: [PATCH 4/9] Removed empty else part of AC_CHECK_FUNC() which caused configure to fail as the generated syntax in it was incorrect --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index ac74f10f..1f7ae2ba 100644 --- a/configure.in +++ b/configure.in @@ -142,7 +142,7 @@ dnl avoid -lnsl checks, if we already have the functions which are dnl usually in libnsl unset ac_cv_func_yp_get_default_domain -AC_CHECK_FUNC(yp_get_default_domain, [ tinyproxy_no_nsl_checks=yes ], [ ]) +AC_CHECK_FUNC(yp_get_default_domain, [ tinyproxy_no_nsl_checks=yes ]) unset ac_cv_func_yp_get_default_domain if test "$tinyproxy_no_nsl_checks" != "yes"; then From 25537d30d36b01ec1f28725defeab6e4f98c7c5b Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Wed, 12 Mar 2008 15:40:12 -0700 Subject: [PATCH 5/9] Corrected datatype of namelen to fix compiler warning --- src/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sock.c b/src/sock.c index 5801a281..d5e8f596 100644 --- a/src/sock.c +++ b/src/sock.c @@ -155,7 +155,7 @@ int listen_sock(uint16_t port, socklen_t *addrlen) char *getpeer_ip(int fd, char *ipaddr) { struct sockaddr_in name; - size_t namelen = sizeof(name); + socklen_t namelen = sizeof(name); assert(fd >= 0); assert(ipaddr != NULL); @@ -183,7 +183,7 @@ char *getpeer_ip(int fd, char *ipaddr) char *getpeer_string(int fd, char *string) { struct sockaddr_in name; - size_t namelen = sizeof(name); + socklen_t namelen = sizeof(name); struct hostent *peername; assert(fd >= 0); From 772c2849e8222e28c852f7d83df51b78c1f06b05 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Wed, 12 Mar 2008 15:45:14 -0700 Subject: [PATCH 6/9] Removed duplicate yylineno definition from scanner.l --- src/scanner.l | 1 - 1 file changed, 1 deletion(-) diff --git a/src/scanner.l b/src/scanner.l index 0f4cf292..7d5f9f45 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -71,7 +71,6 @@ static struct keyword keywords[] = { #define MAX_REGEXP_LEN 1024 -unsigned int yylineno = 1; char tiny_buf[MAX_REGEXP_LEN]; char *tiny_str; From ed253766eae3f28a093153e2882548b434357670 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Wed, 12 Mar 2008 15:46:07 -0700 Subject: [PATCH 7/9] Removed the clean target from the src directory This was overriding the automake clean target to clean up files like *.o by default. --- src/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 25f21d96..5edabb85 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -47,6 +47,3 @@ EXTRA_tinyproxy_SOURCES = grammar.h scanner.c: scanner.l grammar.h $(LEX) $(AM_LFLAGS) $(LFLAGS) -i $< && mv $(LEX_OUTPUT_ROOT).c $@ -clean: - rm -f *.da - rm -f gmon.out \ No newline at end of file From 7c1548cfce7db65eb990f2358b3d38df04b81b26 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Wed, 12 Mar 2008 23:46:33 -0700 Subject: [PATCH 8/9] Fixed format string warnings --- src/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils.c b/src/utils.c index 0954bc46..80948b25 100644 --- a/src/utils.c +++ b/src/utils.c @@ -35,21 +35,21 @@ void *debugging_calloc(size_t nmemb, size_t size, const char *file, unsigned long line) { void *ptr = calloc(nmemb, size); - fprintf(stderr, "{calloc: %p:%u x %u} %s:%lu\n", ptr, nmemb, size, file, line); + fprintf(stderr, "{calloc: %p:%zu x %zu} %s:%lu\n", ptr, nmemb, size, file, line); return ptr; } void *debugging_malloc(size_t size, const char *file, unsigned long line) { void *ptr = malloc(size); - fprintf(stderr, "{malloc: %p:%u} %s:%lu\n", ptr, size, file, line); + fprintf(stderr, "{malloc: %p:%zu} %s:%lu\n", ptr, size, file, line); return ptr; } void *debugging_realloc(void *ptr, size_t size, const char *file, unsigned long line) { void *newptr = realloc(ptr, size); - fprintf(stderr, "{realloc: %p -> %p:%u} %s:%lu\n", ptr, newptr, size, file, line); + fprintf(stderr, "{realloc: %p -> %p:%zu} %s:%lu\n", ptr, newptr, size, file, line); return newptr; } From dea98a3b086761928ce4e25752d0365bc2c0693b Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Wed, 12 Mar 2008 23:59:39 -0700 Subject: [PATCH 9/9] Renamed configure.in to configure.ac --- configure.in => configure.ac | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename configure.in => configure.ac (100%) diff --git a/configure.in b/configure.ac similarity index 100% rename from configure.in rename to configure.ac