bin/183484: commit references a PR

[dfilter service]

The following reply was made to PR bin/183484; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: bin/183484: commit references a PR
Date: Thu, 31 Oct 2013 09:29:45 +0000 (UTC)

 Author: kib
 Date: Thu Oct 31 09:29:37 2013
 New Revision: 257430
 URL: http://svnweb.freebsd.org/changeset/base/257430
 
 Log:
   Remove the dependency on procfs.  Use sysctl KERN_PROC_PATHNAME and
   KERN_PROC_PID to obtain the parent process pathname and command, used
   to determine the calling shell.
   
   Submitted by:	Stefan Neudorf
   PR:	bin/183484
   MFC after:	1 week
 
 Modified:
   head/usr.bin/limits/limits.c
 
 Modified: head/usr.bin/limits/limits.c
 ==============================================================================
 --- head/usr.bin/limits/limits.c	Thu Oct 31 09:20:30 2013	(r257429)
 +++ head/usr.bin/limits/limits.c	Thu Oct 31 09:29:37 2013	(r257430)
 @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/sysctl.h>
 +#include <sys/user.h>
  #include <sys/param.h>
  #include <stdlib.h>
  #include <unistd.h>
 @@ -705,27 +706,32 @@ getshelltype(void)
      pid_t ppid = getppid();
  
      if (ppid != 1) {
 -	FILE * fp;
 +	struct kinfo_proc kp;
  	struct stat st;
 -	char procdir[MAXPATHLEN], buf[128];
 -	int l = sprintf(procdir, "/proc/%ld/", (long)ppid);
 +	char path[MAXPATHLEN];
  	char * shell = getenv("SHELL");
 +	int mib[4];
 +	size_t len;
 +
 +	mib[0] = CTL_KERN;
 +	mib[1] = KERN_PROC;
 +	mib[3] = ppid;
  
  	if (shell != NULL && stat(shell, &st) != -1) {
  	    struct stat st1;
  
 -	    strcpy(procdir+l, "file");
 -	    /* $SHELL is actual shell? */
 -	    if (stat(procdir, &st1) != -1 && memcmp(&st, &st1, sizeof st) == 0)
 -		return getshellbyname(shell);
 -	}
 -	strcpy(procdir+l, "status");
 -	if (stat(procdir, &st) == 0 && (fp = fopen(procdir, "r")) != NULL) {
 -	    char * p = fgets(buf, sizeof buf, fp)==NULL ? NULL : strtok(buf, " \t");
 -	    fclose(fp);
 -	    if (p != NULL)
 -		return getshellbyname(p);
 +	    mib[2] = KERN_PROC_PATHNAME;
 +	    len = sizeof(path);
 +	    if (sysctl(mib, 4, path, &len, NULL, 0) != -1) {
 +		/* $SHELL is actual shell? */
 +		if (stat(path, &st1) != -1 && memcmp(&st, &st1, sizeof st) == 0)
 +		    return getshellbyname(shell);
 +	    }
  	}
 +	mib[2] = KERN_PROC_PID;
 +	len = sizeof(kp);
 +	if (sysctl(mib, 4, &kp, &len, NULL, 0) != -1)
 +	    return getshellbyname(kp.ki_comm);
      }
      return SH_SH;
  }
 _______________________________________________
 svn-src-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"