Update Linux to sync with Mac changes.

Author: jdarpinian

src/x11/main.c

@@ -21,25 +21,9 @@ void run_server(clioptions *opts);
 
 int main(int argc, const char **argv)
 {
-  clioptions *opts = parse_commandline(argc, argv);
-  if (opts == NULL) {
-    return 1;
-  }
-
-  if (opts->browser == NULL) {
-    opts->browser = "xdg-open";
-  }
-
-  if (opts->results == NULL) {
-    opts->results = "";
-  }
-
-  if (opts->browser_args == NULL) {
-    opts->browser_args = "";
-  }
-
-  run_server(opts);
-  free(opts);
+  clioptions opts;
+  parse_commandline(argc, argv, &opts);
+  run_server(&opts);
   return 0;
 }
 

src/x11/screenscraper.c

@@ -221,38 +221,34 @@ void debug_log(const char *message, ...) {
 static pid_t browser_process_pid = 0;
 
 bool open_browser(const char *program, const char *args, const char *url) {
-  size_t buffer_size = 0;
-
+  assert(url);
+  if (browser_process_pid) {
+    debug_log("Warning: calling open_browser, but browser already open.");
+  }
+  if (program == NULL) {
+    program = "xdg-open";
+  }
   if (args == NULL) {
     args = "";
   }
-  buffer_size += strlen(args);
-
-  // NOTE: url is already defined in server.c
-  buffer_size += strlen(url);
-
-  // NOTE: program is defined in main.c
-  buffer_size += strlen(program);
-
-  buffer_size += 3; // Account for spaces and EOL
-  char *buffer = malloc(buffer_size * sizeof(char));
-  sprintf(buffer, "%s %s %s", program, args, url);
-
-  if (strcmp(program, "xdg-open") == 0) {
-    system(buffer);
-  } else {
-    pid_t pid = fork();
-    if (!pid) {
-      // child process, launch the browser!
-      wordexp_t args;
-      wordexp(buffer, &args, 0);
-      execv(args.we_wordv[0], args.we_wordv);
-      exit(1);
-    } else {
-      browser_process_pid = pid;
-    }
+
+  char command_line[4096];
+  snprintf(command_line, sizeof(command_line), "'%s' %s '%s'", program, args, url);
+  command_line[sizeof(command_line) - 1] = '\0';
+
+  wordexp_t expanded_args;
+  int result = wordexp(command_line, &expanded_args, 0);
+  if (result) {
+    debug_log("Failed to parse command line: %s", command_line);
+    return false;
+  }
+  browser_process_pid = fork();
+  if (!browser_process_pid) {
+    // child process, launch the browser!
+    execvp(expanded_args.we_wordv[0], expanded_args.we_wordv);
+    exit(1);
   }
-  free(buffer);
+  wordfree(&expanded_args);
   return true;
 }