projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2004-01-07 Michael Chastain <mec.gnu@mindspring.com>
[deliverable/binutils-gdb.git]
/
gdb
/
environ.c
diff --git
a/gdb/environ.c
b/gdb/environ.c
index c4a5adc375489dcc8a6030c7fed8bd95050c32ec..b62938851b91a53257302609680971af8ef93884 100644
(file)
--- a/
gdb/environ.c
+++ b/
gdb/environ.c
@@
-1,5
+1,7
@@
/* environ.c -- library for manipulating environments for GNU.
/* environ.c -- library for manipulating environments for GNU.
- Copyright (C) 1986, 1989 Free Software Foundation, Inc.
+
+ Copyright 1986, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 2000,
+ 2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-22,15
+24,14
@@
#include "defs.h"
#include "environ.h"
#include "gdb_string.h"
#include "defs.h"
#include "environ.h"
#include "gdb_string.h"
-#include "gdbcore.h"
\f
/* Return a new environment object. */
struct environ *
\f
/* Return a new environment object. */
struct environ *
-make_environ ()
+make_environ (
void
)
{
{
-
register
struct environ *e;
+ struct environ *e;
e = (struct environ *) xmalloc (sizeof (struct environ));
e = (struct environ *) xmalloc (sizeof (struct environ));
@@
-43,15
+44,14
@@
make_environ ()
/* Free an environment and all the strings in it. */
void
/* Free an environment and all the strings in it. */
void
-free_environ (e)
- register struct environ *e;
+free_environ (struct environ *e)
{
{
-
register
char **vector = e->vector;
+ char **vector = e->vector;
while (*vector)
while (*vector)
- free (*vector++);
+
x
free (*vector++);
- free (e);
+
x
free (e);
}
/* Copy the environment given to this process into E.
}
/* Copy the environment given to this process into E.
@@
-59,11
+59,10
@@
free_environ (e)
that all strings in these environments are safe to free. */
void
that all strings in these environments are safe to free. */
void
-init_environ (e)
- register struct environ *e;
+init_environ (struct environ *e)
{
extern char **environ;
{
extern char **environ;
-
register
int i;
+ int i;
if (environ == NULL)
return;
if (environ == NULL)
return;
@@
-81,8
+80,8
@@
init_environ (e)
while (--i >= 0)
{
while (--i >= 0)
{
-
register
int len = strlen (e->vector[i]);
-
register
char *new = (char *) xmalloc (len + 1);
+ int len = strlen (e->vector[i]);
+ char *new = (char *) xmalloc (len + 1);
memcpy (new, e->vector[i], len + 1);
e->vector[i] = new;
}
memcpy (new, e->vector[i], len + 1);
e->vector[i] = new;
}
@@
-92,8
+91,7
@@
init_environ (e)
This is used to get something to pass to execve. */
char **
This is used to get something to pass to execve. */
char **
-environ_vector (e)
- struct environ *e;
+environ_vector (struct environ *e)
{
return e->vector;
}
{
return e->vector;
}
@@
-101,16
+99,14
@@
environ_vector (e)
/* Return the value in environment E of variable VAR. */
char *
/* Return the value in environment E of variable VAR. */
char *
-get_in_environ (e, var)
- const struct environ *e;
- const char *var;
+get_in_environ (const struct environ *e, const char *var)
{
{
-
register
int len = strlen (var);
-
register
char **vector = e->vector;
-
register
char *s;
+ int len = strlen (var);
+ char **vector = e->vector;
+ char *s;
for (; (s = *vector) != NULL; vector++)
for (; (s = *vector) != NULL; vector++)
- if (
STREQN (s, var, len)
&& s[len] == '=')
+ if (
strncmp (s, var, len) == 0
&& s[len] == '=')
return &s[len + 1];
return 0;
return &s[len + 1];
return 0;
@@
-119,18
+115,15
@@
get_in_environ (e, var)
/* Store the value in E of VAR as VALUE. */
void
/* Store the value in E of VAR as VALUE. */
void
-set_in_environ (e, var, value)
- struct environ *e;
- const char *var;
- const char *value;
+set_in_environ (struct environ *e, const char *var, const char *value)
{
{
-
register
int i;
-
register
int len = strlen (var);
-
register
char **vector = e->vector;
-
register
char *s;
+ int i;
+ int len = strlen (var);
+ char **vector = e->vector;
+ char *s;
for (i = 0; (s = vector[i]) != NULL; i++)
for (i = 0; (s = vector[i]) != NULL; i++)
- if (
STREQN (s, var, len)
&& s[len] == '=')
+ if (
strncmp (s, var, len) == 0
&& s[len] == '=')
break;
if (s == 0)
break;
if (s == 0)
@@
-145,7
+138,7
@@
set_in_environ (e, var, value)
vector[i + 1] = 0;
}
else
vector[i + 1] = 0;
}
else
- free (s);
+
x
free (s);
s = (char *) xmalloc (len + strlen (value) + 2);
strcpy (s, var);
s = (char *) xmalloc (len + strlen (value) + 2);
strcpy (s, var);
@@
-169,19
+162,17
@@
set_in_environ (e, var, value)
/* Remove the setting for variable VAR from environment E. */
void
/* Remove the setting for variable VAR from environment E. */
void
-unset_in_environ (e, var)
- struct environ *e;
- char *var;
+unset_in_environ (struct environ *e, char *var)
{
{
-
register
int len = strlen (var);
-
register
char **vector = e->vector;
-
register
char *s;
+ int len = strlen (var);
+ char **vector = e->vector;
+ char *s;
for (; (s = *vector) != NULL; vector++)
{
for (; (s = *vector) != NULL; vector++)
{
- if (STREQN (s, var, len) && s[len] == '=')
+ if (
DEPRECATED_
STREQN (s, var, len) && s[len] == '=')
{
{
- free (s);
+
x
free (s);
/* Walk through the vector, shuffling args down by one, including
the NULL terminator. Can't use memcpy() here since the regions
overlap, and memmove() might not be available. */
/* Walk through the vector, shuffling args down by one, including
the NULL terminator. Can't use memcpy() here since the regions
overlap, and memmove() might not be available. */
This page took
0.031445 seconds
and
4
git commands to generate.