// Name: utils.cpp
// Purpose:
// Author: Robert Roebling
-// Created: 01/02/97
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/utils.h"
#include "wx/string.h"
+#include "wx/intl.h"
+#include "wx/log.h"
+
#include <stdarg.h>
#include <dirent.h>
#include <string.h>
#ifdef __SVR4__
-#include <sys/systeminfo.h>
+ #include <sys/systeminfo.h>
#endif
//------------------------------------------------------------------------
{
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;
};
//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;
+ return FALSE;
// Get official full name of host
// doesn't return the full qualified name, replaced by following
// code (KB)
*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;
}
{
struct passwd *who;
char *comma;
-
+
*buf = '\0';
if ((who = getpwuid (getuid ())) != NULL) {
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 TRUE;
}
return FALSE;
}
{
va_list ap;
va_start( ap, format );
- vfprintf( stderr, format, ap );
+ vfprintf( stderr, format, ap );
fflush( stderr );
va_end(ap);
};
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()
};
//------------------------------------------------------------------------
// subprocess routines
//------------------------------------------------------------------------
-typedef struct {
+struct wxEndProcessData
+{
gint pid, tag;
wxProcess *process;
-} wxEndProcessData;
+};
static void GTK_EndProcessDetector(gpointer data, gint source,
GdkInputCondition WXUNUSED(condition) )
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)
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;
}
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;
+};
projects / wxWidgets.git / blobdiff