From 22bac659a8652e651411cbe1d30283e6a9b28e69 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 21 Dec 2012 15:27:38 -0500 Subject: [PATCH] fixes from nasty path code. --- nucleus/tools/clam_tools/cygwin_fixer.cpp | 11 ++++++++--- scripts/generator/bootstrap_build.sh | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/nucleus/tools/clam_tools/cygwin_fixer.cpp b/nucleus/tools/clam_tools/cygwin_fixer.cpp index 2f4eb1c8..1295d917 100644 --- a/nucleus/tools/clam_tools/cygwin_fixer.cpp +++ b/nucleus/tools/clam_tools/cygwin_fixer.cpp @@ -27,7 +27,7 @@ char *translate_cygwin(char *fname) strncat(newprefix, fname + 11, oldlen - 11 + 1); // one extra for null char. return newprefix; // mem leak here; cannot be helped for quick fix using functional style. } else if ( (fname[0] == '-') && (oldlen > 12) - && (!strncmp(fname + 2, "/cygdrive/", 10) ) { + && (!strncmp(fname + 2, "/cygdrive/", 10)) ) { // in the second case we are looking for command line options. this code handles a parameter // that starts with a single dash and has a single flag character after that. char *newprefix = (char *)malloc(oldlen); @@ -45,12 +45,15 @@ char *translate_cygwin(char *fname) } +/* + function dossify_and_run_commands() { - declare -a darc_commands=() + + declare -a darc_commands=() for i in "$@"; do - # we only mess with the command line on windows. + // we only mess with the command line on windows. if [ "$OS" == "Windows_NT" ]; then if [[ "$i" =~ ^-[a-zA-z][/\"].* ]]; then #echo matched on our pattern for parameters @@ -71,7 +74,9 @@ function dossify_and_run_commands() fi done +} +*/ int main(int argc, char *argv[]) { diff --git a/scripts/generator/bootstrap_build.sh b/scripts/generator/bootstrap_build.sh index 1314e1db..0e2886e1 100644 --- a/scripts/generator/bootstrap_build.sh +++ b/scripts/generator/bootstrap_build.sh @@ -45,7 +45,7 @@ source "$FEISTY_MEOW_SCRIPTS/core/functions.sh" # translate to dos format if there's a cygdrive in there; otherwise microsoft's tools # will hose up completely due to unknown paths. -export FEISTY_MEOW_DIR="$(unix_to_dos $FEISTY_MEOW_DIR)" +export FEISTY_MEOW_DIR="$(unix_to_dos_path $FEISTY_MEOW_DIR)" # load in build variables based on our deduced paths. source "$BUILD_SCRIPTS_DIR/build_variables.sh" "$BUILD_SCRIPTS_DIR/build_variables.sh" -- 2.34.1