Changeset 34695

Timestamp:

Dec 3, 2008, 5:41:50 PM (16 years ago)

Author:

glynn

Message:

Various MinGW bugfixes from Rosen Matev

Location:

grass/trunk/lib/gis

Files:

• locale.c (modified) (1 diff)
• mach_name.c (modified) (1 diff)
• spawn.c (modified) (5 diffs)

grass/trunk/lib/gis/locale.c

@@ -31 +31 @@
 
     setlocale(LC_CTYPE, "");
-    setlocale(LC_MESSAGES, "");
 
 #if defined(HAVE_LIBINTL_H) && defined(USE_NLS)
+#ifdef LC_MESSAGES
+    setlocale(LC_MESSAGES, "");
+#endif
+
     gisbase = getenv("GISBASE");
     if (gisbase && *gisbase) {

grass/trunk/lib/gis/mach_name.c

@@ -32 +32 @@
         strcpy(name, attname.nodename);
     }
-#elif
+#else
     strcpy(name, "unknown");
 #endif

grass/trunk/lib/gis/spawn.c

@@ -62 +62 @@
 {
     va_list va;
-    char *args[MAX_ARGS];
+    const char *args[MAX_ARGS];
     int num_args = 0;
 
@@ -68 +68 @@
 
     for (num_args = 0; num_args < MAX_ARGS;) {
-        char *arg = va_arg(va, char *);
+        const char *arg = va_arg(va, const char *);
 
         args[num_args++] = arg;
@@ -82 +82 @@
     }
 
-    return _spawnv(_P_WAIT, (char *)command, args);
+    return _spawnv(_P_WAIT, command, args);
 }
 
@@ -208 +208 @@
 #ifdef __MINGW32__
 
-static int do_redirects(struct redirect *redirects, int num_redirects)
+static void do_redirects(struct redirect *redirects, int num_redirects)
 {
     if (num_redirects > 0)
@@ -225 +225 @@
 }
 
-static int do_spawn(const char *command)
+static int do_spawn(struct spawn *sp, const char *command)
 {
     char **env;
     int status;
 
-    do_redirects(redirects, num_redirects);
-    env = do_bindings(_environ, bindings, num_bindings);
+    do_redirects(sp->redirects, sp->num_redirects);
+    env = do_bindings(_environ, sp->bindings, sp->num_bindings);
 
     status =
-        spawnvpe(background ? _P_NOWAIT : _P_WAIT, command, (char **)args,
-                 env);
-
-    if (!background && status < 0)
+        spawnvpe(sp->background ? _P_NOWAIT : _P_WAIT, command, sp->args, env);
+
+    if (!sp->background && status < 0)
         G_warning(_("Unable to execute command"));