debugfs.c: the max length of debugfs argument is too short

[android-x86/external-e2fsprogs.git] / config / parse-types.sh

diff --git a/config/parse-types.sh b/config/parse-types.sh
index f4014ea..00371ff 100755 (executable)
--- a/config/parse-types.sh
+++ b/config/parse-types.sh
@@ -1,15 +1,6 @@
 #!/bin/sh
 
-ASM_TYPES=/usr/include/asm/types.h
-
-if test ! -f $ASM_TYPES
-then
-    echo "" > asm_types.h
-    echo "No asm_types file found"
-    exit 1
-fi
-
-cat > /tmp/sed.script << "EOF"
+cat > sed.script << "EOF"
 /^#/d
 /^$/d
 s/__extension__ //
@@ -17,17 +8,30 @@ s/typedef \(.*\) __u\([1-9]*\);/#define __U\2_TYPEDEF \1/
 s/typedef \(.*\) __s\([1-9]*\);/#define __S\2_TYPEDEF \1/
 EOF
 
-gcc -E $ASM_TYPES | sed -f /tmp/sed.script | grep ^# > asm_types.h
+if test -z "$CC"; then
+    CC=gcc
+fi
+
+if test -z "$CPP"; then
+    CPP="$CC -E"
+fi
+
+echo '#include <asm/types.h>' | $CPP - | \
+    sed -f sed.script | grep '^#' > asm_types.h
+
+rm sed.script
 
 cp asm_types.h asm_types.c
 
 cat >> asm_types.c <<EOF
-main(int argc, char **argv)
+#include <stdio.h>
+#include <stdlib.h>
+int main(int argc, char **argv)
 {
 #ifdef __U8_TYPEDEF
        if (sizeof(__U8_TYPEDEF) != 1) {
                printf("Sizeof(__U8__TYPEDEF) is %d should be 1\n", 
-                      sizeof(__U8_TYPEDEF));
+                      (int) sizeof(__U8_TYPEDEF));
                exit(1);
        }
 #else
@@ -36,7 +40,7 @@ main(int argc, char **argv)
 #ifdef __S8_TYPEDEF
        if (sizeof(__S8_TYPEDEF) != 1) {
                printf("Sizeof(_S8__TYPEDEF) is %d should be 1\n", 
-                      sizeof(__S8_TYPEDEF));
+                      (int) sizeof(__S8_TYPEDEF));
                exit(1);
        }
 #else
@@ -45,7 +49,7 @@ main(int argc, char **argv)
 #ifdef __U16_TYPEDEF
        if (sizeof(__U16_TYPEDEF) != 2) {
                printf("Sizeof(__U16__TYPEDEF) is %d should be 2\n", 
-                      sizeof(__U16_TYPEDEF));
+                      (int) sizeof(__U16_TYPEDEF));
                exit(1);
        }
 #else
@@ -54,7 +58,7 @@ main(int argc, char **argv)
 #ifdef __S16_TYPEDEF
        if (sizeof(__S16_TYPEDEF) != 2) {
                printf("Sizeof(__S16__TYPEDEF) is %d should be 2\n", 
-                      sizeof(__S16_TYPEDEF));
+                      (int) sizeof(__S16_TYPEDEF));
                exit(1);
        }
 #else
@@ -64,7 +68,7 @@ main(int argc, char **argv)
 #ifdef __U32_TYPEDEF
        if (sizeof(__U32_TYPEDEF) != 4) {
                printf("Sizeof(__U32__TYPEDEF) is %d should be 4\n", 
-                      sizeof(__U32_TYPEDEF));
+                      (int) sizeof(__U32_TYPEDEF));
                exit(1);
        }
 #else
@@ -73,7 +77,7 @@ main(int argc, char **argv)
 #ifdef __S32_TYPEDEF
        if (sizeof(__S32_TYPEDEF) != 4) {
                printf("Sizeof(__S32__TYPEDEF) is %d should be 4\n", 
-                      sizeof(__S32_TYPEDEF));
+                      (int) sizeof(__S32_TYPEDEF));
                exit(1);
        }
 #else
@@ -83,7 +87,7 @@ main(int argc, char **argv)
 #ifdef __U64_TYPEDEF
        if (sizeof(__U64_TYPEDEF) != 8) {
                printf("Sizeof(__U64__TYPEDEF) is %d should be 8\n", 
-                      sizeof(__U64_TYPEDEF));
+                      (int) sizeof(__U64_TYPEDEF));
                exit(1);
        }
 #else
@@ -92,19 +96,21 @@ main(int argc, char **argv)
 #ifdef __S64_TYPEDEF
        if (sizeof(__S64_TYPEDEF) != 8) {
                printf("Sizeof(__S64__TYPEDEF) is %d should be 8\n", 
-                      sizeof(__S64_TYPEDEF));
+                      (int) sizeof(__S64_TYPEDEF));
                exit(1);
        }
 #else
 #warning __S64_TYPEDEF not defined
 #endif
-       exit(0);
+       return 0;
 }
 EOF
 
-cc -o asm_types asm_types.c
-if ! ./asm_types 
+${BUILD_CC-${CC-gcc}} -o asm_types asm_types.c
+if ./asm_types
 then
+    true
+else
     echo "Problem detected with asm_types.h"
     echo "" > asm_types.h
 fi