X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f555861b7e50f335c7b929bb76be38e9ebd69c5..a5e13868ca700aa39bae26b8fb13c640f466d9f0:/src/gtk1/utilsgtk.cpp diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp index 4a6dbc728d..086ef60b6b 100644 --- a/src/gtk1/utilsgtk.cpp +++ b/src/gtk1/utilsgtk.cpp @@ -2,10 +2,9 @@ // Name: utils.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: +// Id: $Id$ // Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -16,6 +15,9 @@ #include "wx/utils.h" #include "wx/string.h" +#include "wx/intl.h" +#include "wx/log.h" + #include #include #include @@ -28,8 +30,9 @@ #include #include + #ifdef __SVR4__ -#include + #include #endif //------------------------------------------------------------------------ @@ -91,23 +94,23 @@ char *wxGetUserHome( const wxString &user ) { struct passwd *who = (struct passwd *) NULL; - if (user.IsNull() || (user== "")) + if (user.IsNull() || (user== "")) { - register char *ptr; - - if ((ptr = getenv("HOME")) != NULL) - return ptr; - if ((ptr = getenv("USER")) != NULL - || (ptr = getenv("LOGNAME")) != NULL) { - who = getpwnam(ptr); - } - // We now make sure the the user exists! - if (who == NULL) - who = getpwuid(getuid()); - } + register char *ptr; + + if ((ptr = getenv("HOME")) != NULL) + return ptr; + if ((ptr = getenv("USER")) != NULL + || (ptr = getenv("LOGNAME")) != NULL) { + who = getpwnam(ptr); + } + // We now make sure the the user exists! + if (who == NULL) + who = getpwuid(getuid()); + } else who = getpwnam (user); - + return who ? who->pw_dir : (char*)NULL; }; @@ -119,15 +122,31 @@ bool wxGetHostName(char *buf, int sz) { *buf = '\0'; #if defined(__SVR4__) && !defined(__sgi) + //KB: does this return the fully qualified host.domain name? return (sysinfo(SI_HOSTNAME, buf, sz) != -1); #else /* BSD Sockets */ - char name[255]; - struct hostent *h; + char name[255], domain[255]; + //struct hostent *h; // Get hostname if (gethostname(name, sizeof(name)/sizeof(char)-1) == -1) - return FALSE; + return FALSE; + if (getdomainname(domain, sizeof(domain)/sizeof(char)-1) == -1) + return FALSE; // Get official full name of host - strncpy(buf, (h=gethostbyname(name))!=NULL ? h->h_name : name, sz-1); + // doesn't return the full qualified name, replaced by following + // code (KB) + // strncpy(buf, (h=gethostbyname(name))!=NULL ? h->h_name : name, sz-1); + if((unsigned)sz > strlen(name)+strlen(domain)+1) + { + strcpy(buf, name); + if(strcmp(domain,"(none)") == 0) // standalone machine + { + strcat(buf,"."); + strcat(buf,domain); + } + } + else + return FALSE; return TRUE; #endif } @@ -138,8 +157,8 @@ bool wxGetUserId(char *buf, int sz) *buf = '\0'; if ((who = getpwuid(getuid ())) != NULL) { - strncpy (buf, who->pw_name, sz-1); - return TRUE; + strncpy (buf, who->pw_name, sz-1); + return TRUE; } return FALSE; } @@ -147,11 +166,14 @@ bool wxGetUserId(char *buf, int sz) bool wxGetUserName(char *buf, int sz) { struct passwd *who; + char *comma; *buf = '\0'; if ((who = getpwuid (getuid ())) != NULL) { - strncpy (buf, who->pw_gecos, sz - 1); - return TRUE; + comma = strchr(who->pw_gecos,'c'); + if(comma) *comma = '\0'; // cut off non-name comment fields + strncpy (buf, who->pw_gecos, sz - 1); + return TRUE; } return FALSE; } @@ -164,7 +186,7 @@ void wxDebugMsg( const char *format, ... ) { va_list ap; va_start( ap, format ); - vfprintf( stderr, format, ap ); + vfprintf( stderr, format, ap ); fflush( stderr ); va_end(ap); }; @@ -183,7 +205,7 @@ void wxFatalError( const wxString &msg, const wxString &title ) if (!title.IsNull()) fprintf( stderr, "%s ", WXSTRINGCAST(title) ); if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) ); fprintf( stderr, ".\n" ); - exit(1); + exit(3); // the same exit code as for abort() }; //------------------------------------------------------------------------ @@ -202,10 +224,11 @@ bool wxDirExists( const wxString& dir ) // subprocess routines //------------------------------------------------------------------------ -typedef struct { +struct wxEndProcessData +{ gint pid, tag; wxProcess *process; -} wxEndProcessData; +}; static void GTK_EndProcessDetector(gpointer data, gint source, GdkInputCondition WXUNUSED(condition) ) @@ -215,7 +238,7 @@ static void GTK_EndProcessDetector(gpointer data, gint source, pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid); - /* wait4 is not part of any standard, use at own risk + /* wait4 is not part of any standard, use at own risk * not sure what wait4 does, but wait3 seems to be closest, whats a digit ;-) * --- offer@sgi.com */ #if !defined(__sgi) @@ -241,12 +264,11 @@ long wxExecute( char **argv, bool sync, wxProcess *process ) wxEndProcessData *data = new wxEndProcessData; int end_proc_detect[2]; - if (*argv == NULL) - return 0; + wxCHECK_MSG( *argv, 0, "can't exec empty command" ); /* Create pipes */ if (pipe(end_proc_detect) == -1) { - perror("pipe failed"); + wxLogSysError(_("Pipe creation failed")); return 0; } @@ -257,60 +279,67 @@ long wxExecute( char **argv, bool sync, wxProcess *process ) pid_t pid = fork(); #endif if (pid == -1) { - perror ("fork failed"); - return 0; - } else if (pid == 0) { - /* Close fd not useful */ + // error + wxLogSysError(_("Fork failed")); + return 0; + } + else if (pid == 0) { + // we're in child close(end_proc_detect[0]); // close reading side - /* child */ #ifdef _AIX - execvp ((const char *)*argv, (const char **)argv); + execvp ((const char *)*argv, (const char **)argv); #else - execvp (*argv, argv); + execvp (*argv, argv); #endif - if (errno == ENOENT) - wxError("command not found", *argv); - else - perror (*argv); - wxError("could not execute", *argv); - _exit (-1); - } + // there is no return after successful exec() + wxLogSysError(_("Can't execute '%s'"), *argv); - close(end_proc_detect[1]); // close writing side - data->tag = gdk_input_add(end_proc_detect[0], GDK_INPUT_READ, - GTK_EndProcessDetector, (gpointer)data); - data->pid = pid; - if (!sync) { - data->process = process; - } else { - data->process = (wxProcess *) NULL; - data->pid = -(data->pid); - - while (data->pid != 0) - wxYield(); - - delete data; + _exit(-1); + } + else { + // we're in parent + close(end_proc_detect[1]); // close writing side + data->tag = gdk_input_add(end_proc_detect[0], GDK_INPUT_READ, + GTK_EndProcessDetector, (gpointer)data); + data->pid = pid; + if (!sync) { + data->process = process; + } + else { + data->process = (wxProcess *) NULL; + data->pid = -(data->pid); + + while (data->pid != 0) + wxYield(); + + delete data; + } + + // @@@ our return value indicates success even if execvp() in the child + // failed! + return pid; } - - return pid; }; long wxExecute( const wxString& command, bool sync, wxProcess *process ) { - if (command.IsNull() || command == "") return FALSE; + static const char *IFS = " \t\n"; + + wxCHECK_MSG( !command.IsEmpty(), 0, "can't exec empty command" ); int argc = 0; char *argv[127]; - char tmp[1024]; - const char *IFS = " \t\n"; + char *tmp = new char[command.Len() + 1]; + strcpy(tmp, command); - strncpy (tmp, command, sizeof(tmp) / sizeof(char) - 1); - tmp[sizeof (tmp) / sizeof (char) - 1] = '\0'; - argv[argc++] = strtok (tmp, IFS); + argv[argc++] = strtok(tmp, IFS); while ((argv[argc++] = strtok((char *) NULL, IFS)) != NULL) - /* loop */ ; - return wxExecute(argv, sync, process); -}; + /* loop */ ; + long lRc = wxExecute(argv, sync, process); + + delete [] tmp; + return lRc; +};