mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 16:30:41 +00:00
Tidied up
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22977 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm
parent
7cf503e096
commit
6d7eae6095
19 changed files with 111 additions and 95 deletions
|
|
@ -212,12 +212,12 @@ _gnu_process_args(int argc, char *argv[], char *env[])
|
|||
|
||||
if (_gnu_arg_zero != 0)
|
||||
{
|
||||
free(_gnu_arg_zero);
|
||||
objc_free(_gnu_arg_zero);
|
||||
}
|
||||
|
||||
if (argv != 0 && argv[0] != 0)
|
||||
{
|
||||
_gnu_arg_zero = (char*)malloc(strlen(argv[0]) + 1);
|
||||
_gnu_arg_zero = (char*)objc_malloc(strlen(argv[0]) + 1);
|
||||
strcpy(_gnu_arg_zero, argv[0]);
|
||||
arg0 = [[NSString alloc] initWithCString: _gnu_arg_zero];
|
||||
}
|
||||
|
|
@ -232,7 +232,7 @@ _gnu_process_args(int argc, char *argv[], char *env[])
|
|||
while (needed_size == buffer_size)
|
||||
{
|
||||
buffer_size = buffer_size + 256;
|
||||
buffer = (unichar*)malloc(buffer_size * sizeof(unichar));
|
||||
buffer = (unichar*)objc_malloc(buffer_size * sizeof(unichar));
|
||||
needed_size = GetModuleFileNameW(NULL, buffer, buffer_size);
|
||||
if (needed_size < buffer_size)
|
||||
{
|
||||
|
|
@ -249,11 +249,11 @@ _gnu_process_args(int argc, char *argv[], char *env[])
|
|||
}
|
||||
else
|
||||
{
|
||||
free(buffer);
|
||||
objc_free(buffer);
|
||||
}
|
||||
}
|
||||
tmp = [arg0 UTF8String];
|
||||
_gnu_arg_zero = (char*)malloc(strlen(tmp) + 1);
|
||||
_gnu_arg_zero = (char*)objc_malloc(strlen(tmp) + 1);
|
||||
strcpy(_gnu_arg_zero, tmp);
|
||||
#else
|
||||
fprintf(stderr, "Error: for some reason, argv not properly set up "
|
||||
|
|
@ -481,7 +481,7 @@ static char **_gnu_noobjc_env = NULL;
|
|||
/* copy the environment strings */
|
||||
for (count = 0; vectors[count]; count++)
|
||||
;
|
||||
_gnu_noobjc_env = (char**)malloc(sizeof(char*) * (count + 1));
|
||||
_gnu_noobjc_env = (char**)objc_malloc(sizeof(char*) * (count + 1));
|
||||
if (!_gnu_noobjc_env)
|
||||
goto malloc_error;
|
||||
for (i = 0; i < count; i++)
|
||||
|
|
@ -503,7 +503,8 @@ static char **_gnu_noobjc_env = NULL;
|
|||
/* copy the argument strings */
|
||||
for (_gnu_noobjc_argc = 0; vectors[_gnu_noobjc_argc]; _gnu_noobjc_argc++)
|
||||
;
|
||||
_gnu_noobjc_argv = (char**)malloc(sizeof(char*) * (_gnu_noobjc_argc + 1));
|
||||
_gnu_noobjc_argv
|
||||
= (char**)objc_malloc(sizeof(char*) * (_gnu_noobjc_argc + 1));
|
||||
if (!_gnu_noobjc_argv)
|
||||
goto malloc_error;
|
||||
for (i = 0; i < _gnu_noobjc_argc; i++)
|
||||
|
|
@ -523,7 +524,7 @@ static char **_gnu_noobjc_env = NULL;
|
|||
int i, count;
|
||||
|
||||
// Read commandline
|
||||
proc_file_name = (char*)malloc(sizeof(char) * 2048);
|
||||
proc_file_name = (char*)objc_malloc(sizeof(char) * 2048);
|
||||
sprintf(proc_file_name, "/proc/%d/psinfo", (int) getpid());
|
||||
|
||||
ifp = fopen(proc_file_name, "r");
|
||||
|
|
@ -549,7 +550,7 @@ static char **_gnu_noobjc_env = NULL;
|
|||
/* copy the environment strings */
|
||||
for (count = 0; vectors[count]; count++)
|
||||
;
|
||||
_gnu_noobjc_env = (char**)malloc(sizeof(char*) * (count + 1));
|
||||
_gnu_noobjc_env = (char**)objc_malloc(sizeof(char*) * (count + 1));
|
||||
if (!_gnu_noobjc_env)
|
||||
goto malloc_error;
|
||||
for (i = 0; i < count; i++)
|
||||
|
|
@ -570,7 +571,8 @@ static char **_gnu_noobjc_env = NULL;
|
|||
/* copy the argument strings */
|
||||
for (_gnu_noobjc_argc = 0; vectors[_gnu_noobjc_argc]; _gnu_noobjc_argc++)
|
||||
;
|
||||
_gnu_noobjc_argv = (char**)malloc(sizeof(char*) * (_gnu_noobjc_argc + 1));
|
||||
_gnu_noobjc_argv
|
||||
= (char**)objc_malloc(sizeof(char*) * (_gnu_noobjc_argc + 1));
|
||||
if (!_gnu_noobjc_argv)
|
||||
goto malloc_error;
|
||||
for (i = 0; i < _gnu_noobjc_argc; i++)
|
||||
|
|
@ -619,7 +621,7 @@ static char **_gnu_noobjc_env = NULL;
|
|||
while (environ[c] != NULL)
|
||||
c++;
|
||||
env_terms = c;
|
||||
_gnu_noobjc_env = (char**)malloc(sizeof(char*) * (env_terms + 1));
|
||||
_gnu_noobjc_env = (char**)objc_malloc(sizeof(char*) * (env_terms + 1));
|
||||
if (_gnu_noobjc_env == NULL)
|
||||
goto malloc_error;
|
||||
for (c = 0; c < env_terms; c++)
|
||||
|
|
@ -631,7 +633,7 @@ static char **_gnu_noobjc_env = NULL;
|
|||
_gnu_noobjc_env[c] = NULL;
|
||||
|
||||
// Read commandline
|
||||
proc_file_name = (char *)malloc(sizeof(char) * 2048);
|
||||
proc_file_name = (char *)objc_malloc(sizeof(char) * 2048);
|
||||
sprintf(proc_file_name, "/proc/%d/cmdline", (int) getpid());
|
||||
|
||||
/*
|
||||
|
|
@ -664,7 +666,8 @@ static char **_gnu_noobjc_env = NULL;
|
|||
* Now _gnu_noobcj_argc is the number of arguments;
|
||||
* allocate memory accordingly.
|
||||
*/
|
||||
_gnu_noobjc_argv = (char **)malloc((sizeof(char *)) * (_gnu_noobjc_argc + 1));
|
||||
_gnu_noobjc_argv
|
||||
= (char **)objc_malloc((sizeof(char *)) * (_gnu_noobjc_argc + 1));
|
||||
if (_gnu_noobjc_argv == NULL)
|
||||
goto malloc_error;
|
||||
|
||||
|
|
@ -673,7 +676,7 @@ static char **_gnu_noobjc_env = NULL;
|
|||
//freopen(proc_file_name, "r", ifp);
|
||||
if (ifp == NULL)
|
||||
{
|
||||
free(_gnu_noobjc_argv);
|
||||
objc_free(_gnu_noobjc_argv);
|
||||
goto proc_fs_error;
|
||||
}
|
||||
argument = 0;
|
||||
|
|
@ -684,7 +687,8 @@ static char **_gnu_noobjc_env = NULL;
|
|||
length++;
|
||||
if ((c == EOF) || (c == 0)) // End of a parameter
|
||||
{
|
||||
_gnu_noobjc_argv[argument] = (char*)malloc((sizeof(char))*length);
|
||||
_gnu_noobjc_argv[argument]
|
||||
= (char*)objc_malloc((sizeof(char))*length);
|
||||
if (_gnu_noobjc_argv[argument] == NULL)
|
||||
goto malloc_error;
|
||||
argument++;
|
||||
|
|
@ -699,8 +703,8 @@ static char **_gnu_noobjc_env = NULL;
|
|||
if (ifp == NULL)
|
||||
{
|
||||
for (c = 0; c < _gnu_noobjc_argc; c++)
|
||||
free(_gnu_noobjc_argv[c]);
|
||||
free(_gnu_noobjc_argv);
|
||||
objc_free(_gnu_noobjc_argv[c]);
|
||||
objc_free(_gnu_noobjc_argv);
|
||||
goto proc_fs_error;
|
||||
}
|
||||
argument = 0;
|
||||
|
|
@ -732,7 +736,7 @@ static char **_gnu_noobjc_env = NULL;
|
|||
}
|
||||
_gnu_noobjc_argv[argument] = NULL;
|
||||
fclose(ifp);
|
||||
free(proc_file_name);
|
||||
objc_free(proc_file_name);
|
||||
return;
|
||||
|
||||
proc_fs_error:
|
||||
|
|
@ -748,7 +752,7 @@ static char **_gnu_noobjc_env = NULL;
|
|||
#ifdef HAVE_PROGRAM_INVOCATION_NAME
|
||||
fprintf(stderr, "We try to go on anyway; but the program will ignore any argument which were passed to it.\n");
|
||||
_gnu_noobjc_argc = 1;
|
||||
_gnu_noobjc_argv = malloc(sizeof(char *) * 2);
|
||||
_gnu_noobjc_argv = objc_malloc(sizeof(char *) * 2);
|
||||
if (_gnu_noobjc_argv == NULL)
|
||||
goto malloc_error;
|
||||
_gnu_noobjc_argv[0] = strdup(program_invocation_name);
|
||||
|
|
@ -766,7 +770,7 @@ static char **_gnu_noobjc_env = NULL;
|
|||
#endif /* HAVE_PROGRAM_INVOCATION_NAME */
|
||||
#endif /* !HAVE_KVM_ENV (e.g. HAVE_PROCFS) */
|
||||
malloc_error:
|
||||
fprintf(stderr, "malloc() error when starting gnustep-base.\n");
|
||||
fprintf(stderr, "objc_malloc() error when starting gnustep-base.\n");
|
||||
fprintf(stderr, "Free some memory and then re-run the program.\n");
|
||||
abort();
|
||||
}
|
||||
|
|
@ -779,19 +783,19 @@ _gnu_noobjc_free_vars(void)
|
|||
p = _gnu_noobjc_argv;
|
||||
while (*p)
|
||||
{
|
||||
free(*p);
|
||||
objc_free(*p);
|
||||
p++;
|
||||
}
|
||||
free(_gnu_noobjc_argv);
|
||||
objc_free(_gnu_noobjc_argv);
|
||||
_gnu_noobjc_argv = 0;
|
||||
|
||||
p = _gnu_noobjc_env;
|
||||
while (*p)
|
||||
{
|
||||
free(*p);
|
||||
objc_free(*p);
|
||||
p++;
|
||||
}
|
||||
free(_gnu_noobjc_env);
|
||||
objc_free(_gnu_noobjc_env);
|
||||
_gnu_noobjc_env = 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue