Commitf0e7004

Bryan Henderson

committed

Make strdup work for Ultrix. Thanks Erik Bertelsen

1 parent0667fd9 commitf0e7004Copy full SHA for f0e7004

File tree

-20

lines changed

-20

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.10 1996/11/26 07:38:16 bryanh Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.11 1996/11/28 03:31:27 bryanh Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -27,7 +27,7 @@ pg_dump: $(OBJS) $(LIBPQDIR)/libpq.a`
`27`	`27`	`$(CC)$(LDFLAGS) -o pg_dump -L$(LIBPQDIR)$(OBJS) -lpq$(LD_ADD)`
`28`	`28`
`29`	`29`	`../../utils/strdup.o:`
`30`		`-$(MAKE) -C ../../utils/strdup.o`
	`30`	`+$(MAKE) -C ../../utilsstrdup.o`
`31`	`31`
`32`	`32`	`.PHONY: submake`
`33`	`33`	`submake:`

Lines changed: 1 addition & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.21 1996/11/26 07:38:55 bryanh Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.22 1996/11/28 03:32:12 bryanh Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -34,20 +34,6 @@`
`34`	`34`	`#include"strdup.h"`
`35`	`35`	`#endif`
`36`	`36`
`37`		`-#if defined(ultrix4)\|\| defined(next)`
`38`		`-/* ultrix is lame and doesn't have strdup in libc for some reason */`
`39`		`-/* [TRH] So doesn't NEXTSTEP. But whaddaya expect for a non-ANSI`
`40`		`-standard function? (My, my. Touchy today, are we?) */`
`41`		`-char*`
`42`		`-strdup(constchar*string)`
`43`		`-{`
`44`		`-char*nstr;`
`45`		`-`
`46`		`-if ((nstr=malloc(strlen(string)+1))!=NULL)`
`47`		`-strcpy(nstr,string);`
`48`		`-returnnstr;`
`49`		`-}`
`50`		`-#endif`
`51`	`37`
`52`	`38`	`/* use a local version instead of the one found in pqpacket.c */`
`53`	`39`	`staticConnStatusTypeconnectDB(PGconn*conn);`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,18 +7,19 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/utils/Attic/strdup.c,v 1.1 1996/11/27 01:46:52 bryanh Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/utils/Attic/strdup.c,v 1.2 1996/11/28 03:32:18 bryanh Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`14`	`14`	`#include<string.h>`
	`15`	`+#include<stdlib.h>`
`15`	`16`	`#include"strdup.h"`
`16`	`17`
`17`	`18`	`char*`
`18`		`-strdup(char*string)`
	`19`	`+strdup(charconst*string)`
`19`	`20`	`{`
`20`	`21`	`char*nstr;`
`21`	`22`
`22`		`-nstr=strcpy((char*)palloc(strlen(string)+1),string);`
	`23`	`+nstr=strcpy((char*)malloc(strlen(string)+1),string);`
`23`	`24`	`returnnstr;`
`24`	`25`	`}`

Comments

(0)