Changeset 4555:304dd9501edb in roaraudio

Timestamp:

10/26/10 23:28:05 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Escape user input to configure script correctly (Closes: #28)

Files:

• ChangeLog (modified) (1 diff)
• configure (modified) (10 diffs)

ChangeLog

@@ -16 +16 @@
         * Implemented atomic flag toggling and flag protection.
         * Started porting to OpenVMS (See #24)
+        * Escape user input to configure script correctly (Closes: #28)
 
 v. 0.4beta0 - Fri Oct 01 2010 13:36 CEST

configure

@@ -123 +123 @@
 
 _CARGS="$@";
+
+# some very basic string functions:
+to_upper() {
+ tr 'a-z' 'A-Z'
+}
+
+to_escaped() {
+ tr 'A-Z/.+-' 'a-z____'
+}
 
 echo -n "checking for version of this package... "
@@ -308 +317 @@
   ;;
   '--no-'*)
-   lib=$(echo "$1" | sed 's/^--no-//')
+   lib=$(echo "$1" | sed 's/^--no-//' | to_escaped)
    eval no_lib_$lib=true
   ;;
   '--maybe-'*)
-   lib=$(echo "$1" | sed 's/^--maybe-//')
+   lib=$(echo "$1" | sed 's/^--maybe-//' | to_escaped)
    eval unset no_lib_$lib
   ;;
@@ -624 +633 @@
  [ "$subdir" = '%' ] && subdir=''
 
- envlib=`echo "$lib"   | cut -d/ -f1 | tr A-Z/.+- a-z____`
- envname=`echo "$name" | cut -d/ -f1 | tr A-Z/.+- a-z____`
+ envlib=`echo "$lib"   | cut -d/ -f1 | to_escaped`
+ envname=`echo "$name" | cut -d/ -f1 | to_escaped`
 
  if [ "$lib" != '--' ]
@@ -685 +694 @@
  if test_lib "$name" $LIBS "$@"
  then
-  subdir_var='subdir_'"`echo $subdir | tr / _`"
+  subdir_var='subdir_'"`echo $subdir | to_escaped`"
   echo "#define $def"            >&3
   [ "$subdir" != '' ] && \
@@ -807 +816 @@
  echo $_ver
 
- _ver_def=$(echo $_ver | tr .a-z- _A-Z_)
+ _ver_def=$(echo $_ver | to_escaped | to_upper)
  echo "#define ${DEF}_$_ver_def" >&3
 
@@ -837 +846 @@
  for _h in $HEADERS
  do
-  envname=`echo "$_h" | cut -d/ -f1 | tr A-Z/.+- a-z____`
+  envname=`echo "$_h" | cut -d/ -f1 | to_escaped`
   eval "_t=\$libname_$envname"
   if [ "$_t" = 'false' ]
@@ -1144 +1153 @@
  for i in $WITHOUT_CF
  do
-  i=$(echo $i | tr /a-z/ /A-Z/);
+  i=$(echo $i | to_upper);
   echo '#define ROAR_WITHOUT_CF_'$i
  done
@@ -1150 +1159 @@
  for i in $WITHOUT_VIO
  do
-  i=$(echo $i | tr /a-z/ /A-Z/);
+  i=$(echo $i | to_upper);
   echo '#define ROAR_WITHOUT_VIO_'$i
  done
@@ -1156 +1165 @@
  for i in $WITHOUT_DCOMP
  do
-  i=$(echo $i | tr /a-z/ /A-Z/);
+  i=$(echo $i | to_upper);
   echo '#define ROAR_WITHOUT_DCOMP_'$i
  done
@@ -1164 +1173 @@
  $TARGET_WIN32           && echo '#define ROAR_TARGET_WIN32'
  $TARGET_CYGWIN          && echo '#define ROAR_TARGET_CYGWIN'
-                            echo '#define ROAR_OS_'$(echo $SYSNAME | tr a-z-. A-Z__)
+                            echo '#define ROAR_OS_'$(echo $SYSNAME | to_escaped | to_upper)
  echo
 } >&3