[ViewVC] Diff of: cvs/rxvt-unicode/src/init.C

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.215 by root, Mon Oct 8 15:36:13 2007 UTC vs.
Revision 1.217 by root, Tue Oct 9 13:36:10 2007 UTC

    */
   for (r_argc = 0; r_argc < argc; r_argc++)
     if (!strcmp (argv[r_argc], "-e"))
       break;
+  if (r_argc == argc)
+    cmd_argv = NULL;
+  else if (!argv[r_argc + 1])
+    rxvt_fatal ("-e requires an argument\n");
+  else
+    {
+      cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
+      for (i = 0; i < argc - r_argc - 1; i++)
+        cmd_argv[i] = (const char *)argv[i + r_argc + 1];
+      cmd_argv[i] = NULL;
+    }
   r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
   for (i = 0; i < r_argc; i++)
     r_argv[i] = (const char *)argv[i];
   r_argv[i] = NULL;
-  if (r_argc == argc)
-    cmd_argv = NULL;
-  else
-    {
-      cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
-      for (i = 0; i < argc - r_argc - 1; i++)
-        cmd_argv[i] = (const char *)argv[i + r_argc + 1];
-      cmd_argv[i] = NULL;
-    }
   rs[Rs_name] = rxvt_basename (argv[0]);
   /*
    * Open display, get options/resources and create the window
     rs[Rs_display_name] = ":0";
   get_options (r_argc, r_argv);
   if (!(display = displays.get (rs[Rs_display_name])))
+    {
+      free (r_argv);
-    rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
+      rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
+    }
   // using a local pointer decreases code size a lot
   xa = display->xa;
   set (display);

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines