comparison src/process.c @ 98246:06b2f516c2fb

(procfs_system_process_attributes): Fix cmdline in case /proc/PID/cmdline is empty.

98245:dd5392c63164

  /* args */
  strcpy (procfn_end, "/cmdline");
  fd = emacs_open (fn, O_RDONLY, 0);
  if (fd >= 0)
    {
      for (cmdsize = 0; emacs_read (fd, &c, 1) == 1; cmdsize++)
	{
	  if (isspace (c) || c == '\\')
	    cmdsize++;	/* for later quoting, see below */
	}
      if (cmdsize)
	{
	  cmdline = xmalloc (cmdsize + 1);
	  lseek (fd, 0L, SEEK_SET);
	  cmdline[0] = '\0';
	  if ((nread = read (fd, cmdline, cmdsize)) >= 0)
	    cmdline[nread++] = '\0';
	  /* We don't want trailing null characters.  */
	  for (p = cmdline + nread - 1; p > cmdline && !*p; p--)
	    nread--;
	  for (p = cmdline; p < cmdline + nread; p++)

		  *p++ = '\\';
		}
	      else if (*p == '\0')
		*p = ' ';
	    }
	  cmdsize = nread;
	}
      else
	{
	  cmdsize = strlen (cmd) + 2;
	  cmdline = xmalloc (cmdsize + 1);
	  strcpy (cmdline, "[");
	  strcat (strcat (cmdline, cmd), "]");
	}
      emacs_close (fd);
      /* Command line is encoded in locale-coding-system; decode it.  */
      cmd_str = make_unibyte_string (cmdline, cmdsize);
      decoded_cmd = code_convert_string_norecord (cmd_str,
						  Vlocale_coding_system, 0);
      xfree (cmdline);
      attrs = Fcons (Fcons (Qargs, decoded_cmd), attrs);
    }

98246:06b2f516c2fb

  /* args */
  strcpy (procfn_end, "/cmdline");
  fd = emacs_open (fn, O_RDONLY, 0);
  if (fd >= 0)
    {
      for (cmdline_size = 0; emacs_read (fd, &c, 1) == 1; cmdline_size++)
	{
	  if (isspace (c) || c == '\\')
	    cmdline_size++;	/* for later quoting, see below */
	}
      if (cmdline_size)
	{
	  cmdline = xmalloc (cmdline_size + 1);
	  lseek (fd, 0L, SEEK_SET);
	  cmdline[0] = '\0';
	  if ((nread = read (fd, cmdline, cmdline_size)) >= 0)
	    cmdline[nread++] = '\0';
	  /* We don't want trailing null characters.  */
	  for (p = cmdline + nread - 1; p > cmdline && !*p; p--)
	    nread--;
	  for (p = cmdline; p < cmdline + nread; p++)

		  *p++ = '\\';
		}
	      else if (*p == '\0')
		*p = ' ';
	    }
	  cmdline_size = nread;
	}
      else
	{
	  cmdline_size = cmdsize + 2;
	  cmdline = xmalloc (cmdline_size + 1);
	  strcpy (cmdline, "[");
	  strcat (strncat (cmdline, cmd, cmdsize), "]");
	}
      emacs_close (fd);
      /* Command line is encoded in locale-coding-system; decode it.  */
      cmd_str = make_unibyte_string (cmdline, cmdline_size);
      decoded_cmd = code_convert_string_norecord (cmd_str,
						  Vlocale_coding_system, 0);
      xfree (cmdline);
      attrs = Fcons (Fcons (Qargs, decoded_cmd), attrs);
    }