* tm-rs6000.h (AIX_BUGGY_PTRACE_CALL): Zap, we think we fixed it.

[deliverable/binutils-gdb.git] / gdb / putenv.c

diff --git a/gdb/putenv.c b/gdb/putenv.c
index bf477f9c418013ba8921192e8d25c74abd0852f0..d111e85d251d1f38da9d244bd013a56c14f8990f 100644 (file)
--- a/gdb/putenv.c
+++ b/gdb/putenv.c
@@ -68,15 +68,17 @@ putenv( entry )
 {
   unsigned length;
   unsigned size;
+  char     *temp;
   char     **p;
   char     **new_environ;
 
   /*  Find the length of the "NAME="  */
 
-  if ( (length=(unsigned) index(entry,'=')) == NULL )
+  temp = index(entry,'=');
+  if ( temp == 0 )
     return( -1 );
 
-  length = length - (unsigned) entry + 1;
+  length = (unsigned) (temp - entry + 1);
 
 
   /*  Scan through the environment looking for "NAME="  */
@@ -85,7 +87,7 @@ putenv( entry )
     if ( strncmp( entry, *p, length ) == 0 )
       {
       *p = entry;
-      return( NULL );
+      return( 0 );
       }
 
 
@@ -95,15 +97,15 @@ putenv( entry )
 
   new_environ = (char **) malloc( (size+2)*PSIZE );
 
-  if ( new_environ == NULL )
+  if ( new_environ == (char **) NULL )
     return( -1 );
 
-  bcopy( (char *) environ, (char *) new_environ, size*PSIZE );
+  memcpy ((char *) new_environ, (char *) environ, size*PSIZE );
 
   new_environ[size]   = entry;
   new_environ[size+1] = NULL;
 
   environ = new_environ;
 
-  return(NULL);
+  return(0);
 }