From fdb77f362de0ad08462c68bd77c2fe8133f09e3d Mon Sep 17 00:00:00 2001 From: Julien Iguchi-Cartigny Date: Fri, 20 May 2011 13:35:50 +0200 Subject: [PATCH] fixing uml tools change mcsonole socket location patch --- src/Makefile | 2 +- ...ools-change-mconsole-socket-location.patch | 42 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Makefile b/src/Makefile index 67cc513..a666e27 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,4 @@ -UML_TOOLS_DIR=uml-tools/ +UML_TOOLS_DIR=tools-20070815/ BUILD_DIR=build/ PATCHES_DIR=patches/ diff --git a/src/patches/uml_tools-change-mconsole-socket-location.patch b/src/patches/uml_tools-change-mconsole-socket-location.patch index dc8f353..b8aebbb 100644 --- a/src/patches/uml_tools-change-mconsole-socket-location.patch +++ b/src/patches/uml_tools-change-mconsole-socket-location.patch @@ -1,26 +1,26 @@ -diff -Naur uml-tools//mconsole/uml_mconsole.c build/mconsole/uml_mconsole.c ---- uml-tools//mconsole/uml_mconsole.c 2004-04-08 03:43:29.000000000 +0200 -+++ build/mconsole/uml_mconsole.c 2011-05-20 12:16:00.044639001 +0200 -@@ -62,6 +62,22 @@ - int try_file = 1; +diff -Naur uml-utilities-20070815-original//mconsole/uml_mconsole.c uml-utilities-20070815/mconsole/uml_mconsole.c +--- uml-utilities-20070815-original//mconsole/uml_mconsole.c 2006-02-28 05:05:32.000000000 +0100 ++++ uml-utilities-20070815/mconsole/uml_mconsole.c 2011-04-26 15:16:07.129258342 +0200 +@@ -88,6 +88,22 @@ + int try_file = 1; - if((home = getenv("HOME")) != NULL){ + if((home = getenv("HOME")) != NULL){ + -+ /*****************************************/ -+ /* Changed for compatibility with Netkit */ -+ /*****************************************/ ++ /*****************************************/ ++ /* Changed for compatibility with Netkit */ ++ /*****************************************/ + -+ /* Management consoles are made available inside .netkit -+ in the user's home directory. Look there first and -+ everywhere else only in case of failure. */ ++ /* Management consoles are made available inside .netkit ++ in the user's home directory. Look there first and ++ everywhere else only in case of failure. */ + -+ snprintf(dir, sizeof(dir), "%s/.netkit/mconsole", home); -+ snprintf(file, sizeof(file), "%s/%s/mconsole", dir, name); -+ if(strncmp(name, dir, strlen(dir))){ -+ if(!do_switch(dir, file, name)) return(0); -+ try_file = 0; -+ } ++ snprintf(dir, sizeof(dir), "%s/.netkit/mconsole", home); ++ snprintf(file, sizeof(file), "%s/%s/mconsole", dir, name); ++ if(strncmp(name, dir, strlen(dir))){ ++ if(!do_switch(dir, file, name)) return(0); ++ try_file = 0; ++ } + - snprintf(dir, sizeof(dir), "%s/.uml", home); - snprintf(file, sizeof(file), "%s/%s/mconsole", dir, name); - if(strncmp(name, dir, strlen(dir))){ + snprintf(dir, sizeof(dir), "%s/.uml", home); + snprintf(file, sizeof(file), "%s/%s/mconsole", dir, name); + if(strncmp(name, dir, strlen(dir))){