From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91] helo=mail.sourceforge.net) by sc8-sf-list1.sourceforge.net with esmtp (Exim 4.30) id 1FRFHD-0003jw-LQ for user-mode-linux-devel@lists.sourceforge.net; Wed, 05 Apr 2006 14:10:55 -0700 Received: from 213-140-2-68.ip.fastwebnet.it ([213.140.2.68] helo=aa001msg.fastwebnet.it) by mail.sourceforge.net with esmtp (Exim 4.44) id 1FRFHD-0006DY-0W for user-mode-linux-devel@lists.sourceforge.net; Wed, 05 Apr 2006 14:10:55 -0700 From: Mattia Dongili Subject: Re: [uml-devel] [RFC][PATCH] include /usr/lib/uml in PATH Message-ID: <20060405211153.GE8583@inferi.kami.home> References: <20060402173445.GB5108@inferi.kami.home> <20060402195409.GA3695@inferi.kami.home> <200604040239.45495.blaisorblade@yahoo.it> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="+HP7ph2BbKc20aGI" Content-Disposition: inline In-Reply-To: <200604040239.45495.blaisorblade@yahoo.it> Sender: user-mode-linux-devel-admin@lists.sourceforge.net Errors-To: user-mode-linux-devel-admin@lists.sourceforge.net List-Unsubscribe: , List-Id: The user-mode Linux development list List-Post: List-Help: List-Subscribe: , List-Archive: Date: Wed, 5 Apr 2006 23:11:53 +0200 To: Blaisorblade Cc: user-mode-linux-devel@lists.sourceforge.net, Geert Uytterhoeven , Jeff Dike --+HP7ph2BbKc20aGI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Apr 04, 2006 at 02:39:44AM +0200, Blaisorblade wrote: > On Sunday 02 April 2006 21:54, Mattia Dongili wrote: [...] > Thanks for the patch, we'll possibly apply it, but we need to reimplement (or > copy and fix from glibc) a two-phase execvp(). I've not done it because I've > felt unconfortable with the idea but it's the better I could think of for > now. Hmm. I see. > However, probably the patch can be merged anyway, or at least its idea... [...] > *) I'd agree with Geert, but you're indeed correct for that... > *) Saying "19" gets a "NO" I'm sorry... damn lazy programmers :) > > #define UML_LIB_PATH ":/usr/lib/uml" what about a config option instead? CONFIG_UML_NET_PATH > 19 -> strlen(UML_LIB_PATH) > in snprintf, "PATH=%s:/usr/lib/uml" -> "PATH=%s" UML_LIB_PATH > > (using string literal concatenation) here's an updated patch, I added a check for current PATH=="" to avoid touching the PATH variable when empty (again, kind of keeping the same behaviour of a clean execvp, I mean it makes no sense to append /usr/lib/uml and not /bin:/usr/bin too). Description: append /usr/lib/uml to the existing PATH environment variable to let execvp search uml_net in FHS compliant locations. Signed-off-by: Mattia Dongili -- mattia :wq! --+HP7ph2BbKc20aGI Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="uml_net-2.diff" diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c index 2878e89..774a3d7 100644 --- a/arch/um/os-Linux/main.c +++ b/arch/um/os-Linux/main.c @@ -74,6 +74,38 @@ static void last_ditch_exit(int sig) exit(1); } +#define UML_LIB_PATH ":/usr/lib/uml" + +static void setup_env_path(void) { + char *new_path = NULL; + char *old_path = NULL; + int path_len = 0; + + old_path = getenv("PATH"); + if (!old_path) { + /* if no PATH variable is set, just use + * the default + /usr/lib/uml + */ + putenv("PATH=:/bin:/usr/bin/" UML_LIB_PATH); + return; + } + + /* do nothing if the PATH variable exists but is empty */ + path_len = strlen(old_path); + if (!path_len) + return; + + /* append /usr/lib/uml to the existing path */ + path_len += strlen("PATH=" UML_LIB_PATH) + 1; + new_path = malloc(path_len * sizeof(char)); + if (!new_path) { + perror("coudn't malloc to set a new PATH"); + return; + } + snprintf(new_path, path_len, "PATH=%s" UML_LIB_PATH, old_path); + putenv(new_path); +} + extern int uml_exitcode; extern void scan_elf_aux( char **envp); @@ -114,6 +146,8 @@ int main(int argc, char **argv, char **e set_stklim(); + setup_env_path(); + new_argv = malloc((argc + 1) * sizeof(char *)); if(new_argv == NULL){ perror("Mallocing argv"); --+HP7ph2BbKc20aGI-- ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel