Changeset 1980 for trunk/src/kmk/commands.c

Timestamp:

Oct 28, 2008, 12:25:49 AM (17 years ago)

Author:

bird

Message:

kmk: Some cleanup.

File:

• trunk/src/kmk/commands.c (modified) (4 diffs)

trunk/src/kmk/commands.c

@@ -413 +413 @@
 
   cmds->any_recurse = 0;
-#ifdef CONFIG_WITH_COMMANDS_FUNC
+#ifndef CONFIG_WITH_COMMANDS_FUNC
+  cmds->lines_flags = xmalloc (nlines);
+#else
   cmds->lines_flags = xmalloc (nlines * sizeof (cmds->lines_flags[0]));
-#else
-  cmds->lines_flags = xmalloc (nlines);
 #endif
   for (idx = 0; idx < nlines; ++idx)
@@ -423 +423 @@
 
       for (p = lines[idx];
-#ifdef CONFIG_WITH_COMMANDS_FUNC
+#ifndef CONFIG_WITH_COMMANDS_FUNC
+            isblank ((unsigned char)*p) || *p == '-' || *p == '@' || *p == '+';
+#else
            isblank ((unsigned char)*p) || *p == '-' || *p == '@' || *p == '+' || *p == '%';
-#else
-           isblank ((unsigned char)*p) || *p == '-' || *p == '@' || *p == '+';
 #endif
            ++p)
@@ -536 +536 @@
   exit (10);
 #else /* not Amiga */
-#if defined(WINDOWS32) && !defined(CONFIG_NEW_WIN32_CTRL_EVENT)
+#if defined (WINDOWS32) && !defined (CONFIG_NEW_WIN32_CTRL_EVENT)
   extern HANDLE main_thread;
 
@@ -618 +618 @@
 
 #ifdef WINDOWS32
-#ifndef CONFIG_NEW_WIN32_CTRL_EVENT
+# ifndef CONFIG_NEW_WIN32_CTRL_EVENT
   if (main_thread)
     CloseHandle (main_thread);
-#endif /* !CONFIG_NEW_WIN32_CTRL_EVENT */
+# endif /* !CONFIG_NEW_WIN32_CTRL_EVENT */
   /* Cannot call W32_kill with a pid (it needs a handle).  The exit
      status of 130 emulates what happens in Bash.  */