Commit f0e7004d authored by Bryan Henderson's avatar Bryan Henderson

Make strdup work for Ultrix. Thanks Erik Bertelsen

parent 0667fd94
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.10 1996/11/26 07:38:16 bryanh Exp $ # $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.11 1996/11/28 03:31:27 bryanh Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -27,7 +27,7 @@ pg_dump: $(OBJS) $(LIBPQDIR)/libpq.a ...@@ -27,7 +27,7 @@ pg_dump: $(OBJS) $(LIBPQDIR)/libpq.a
$(CC) $(LDFLAGS) -o pg_dump -L$(LIBPQDIR) $(OBJS) -lpq $(LD_ADD) $(CC) $(LDFLAGS) -o pg_dump -L$(LIBPQDIR) $(OBJS) -lpq $(LD_ADD)
../../utils/strdup.o: ../../utils/strdup.o:
$(MAKE) -C ../../utils/strdup.o $(MAKE) -C ../../utils strdup.o
.PHONY: submake .PHONY: submake
submake: submake:
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.21 1996/11/26 07:38:55 bryanh Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.22 1996/11/28 03:32:12 bryanh Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -34,20 +34,6 @@ ...@@ -34,20 +34,6 @@
#include "strdup.h" #include "strdup.h"
#endif #endif
#if defined(ultrix4) || defined(next)
/* ultrix is lame and doesn't have strdup in libc for some reason */
/* [TRH] So doesn't NEXTSTEP. But whaddaya expect for a non-ANSI
standard function? (My, my. Touchy today, are we?) */
char *
strdup(const char *string)
{
char *nstr;
if ((nstr = malloc(strlen(string)+1)) != NULL)
strcpy(nstr, string);
return nstr;
}
#endif
/* use a local version instead of the one found in pqpacket.c */ /* use a local version instead of the one found in pqpacket.c */
static ConnStatusType connectDB(PGconn *conn); static ConnStatusType connectDB(PGconn *conn);
......
...@@ -7,18 +7,19 @@ ...@@ -7,18 +7,19 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/utils/Attic/strdup.c,v 1.1 1996/11/27 01:46:52 bryanh Exp $ * $Header: /cvsroot/pgsql/src/utils/Attic/strdup.c,v 1.2 1996/11/28 03:32:18 bryanh Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include <string.h> #include <string.h>
#include <stdlib.h>
#include "strdup.h" #include "strdup.h"
char * char *
strdup(char *string) strdup(char const *string)
{ {
char *nstr; char *nstr;
nstr = strcpy((char *)palloc(strlen(string)+1), string); nstr = strcpy((char *)malloc(strlen(string)+1), string);
return nstr; return nstr;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment