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 8da34fd..00371ff 100755 (executable)
--- a/config/parse-types.sh
+++ b/config/parse-types.sh
@@ -8,8 +8,16 @@ s/typedef \(.*\) __u\([1-9]*\);/#define __U\2_TYPEDEF \1/
 s/typedef \(.*\) __s\([1-9]*\);/#define __S\2_TYPEDEF \1/
 EOF
 
-echo '#include <asm/types.h>' | ${CPP-${CC-gcc} -E} - | \
-    sed -f 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
 
@@ -18,12 +26,12 @@ cp asm_types.h asm_types.c
 cat >> asm_types.c <<EOF
 #include <stdio.h>
 #include <stdlib.h>
-main(int argc, char **argv)
+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
@@ -32,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
@@ -41,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
@@ -50,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
@@ -60,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
@@ -69,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
@@ -79,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
@@ -88,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
 
 ${BUILD_CC-${CC-gcc}} -o asm_types asm_types.c
-if ! ./asm_types 
+if ./asm_types
 then
+    true
+else
     echo "Problem detected with asm_types.h"
     echo "" > asm_types.h
 fi