diff -Naur parted-1.6.9.orig/configure parted-1.6.9/configure
--- parted-1.6.9.orig/configure	2004-05-10 21:03:19.000000000 +0200
+++ parted-1.6.9/configure	2004-05-10 21:03:41.000000000 +0200
@@ -1167,7 +1167,7 @@
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd "$ac_popdir"
+    cd $ac_popdir
   done
 fi
 
@@ -2804,7 +2804,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2862,7 +2863,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2978,7 +2980,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3032,7 +3035,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3077,7 +3081,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3121,7 +3126,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3302,7 +3308,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3700,7 +3707,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3758,7 +3766,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3874,7 +3883,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3928,7 +3938,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3973,7 +3984,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4017,7 +4029,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4509,7 +4522,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4538,7 +4552,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4608,7 +4623,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4660,7 +4676,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4731,7 +4748,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4783,7 +4801,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4856,7 +4875,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4923,7 +4943,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4968,7 +4989,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5029,7 +5051,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5074,7 +5097,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5143,7 +5167,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5174,8 +5199,10 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -5819,7 +5846,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5822 "configure"' > conftest.$ac_ext
+  echo '#line 5849 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5939,7 +5966,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6013,7 +6041,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6183,7 +6212,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6250,7 +6280,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6510,7 +6541,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6568,7 +6600,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6639,7 +6672,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6683,7 +6717,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7141,7 +7176,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:7144:" \
+echo "$as_me:7179:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -7187,7 +7222,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7236,7 +7272,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8173,11 +8210,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8176: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8213: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8180: \$? = $ac_status" >&5
+   echo "$as_me:8217: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -8406,11 +8443,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8409: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8446: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8413: \$? = $ac_status" >&5
+   echo "$as_me:8450: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -8466,11 +8503,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8469: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8506: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8473: \$? = $ac_status" >&5
+   echo "$as_me:8510: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8857,7 +8894,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8917,7 +8955,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10108,7 +10147,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10211,7 +10251,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10276,7 +10317,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10369,7 +10411,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10434,7 +10477,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10500,7 +10544,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10566,7 +10611,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10641,7 +10687,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10644 "configure"
+#line 10690 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10739,7 +10785,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10742 "configure"
+#line 10788 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11811,7 +11857,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11872,7 +11919,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12916,11 +12964,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12919: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12967: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12923: \$? = $ac_status" >&5
+   echo "$as_me:12971: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -12976,11 +13024,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12979: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13027: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12983: \$? = $ac_status" >&5
+   echo "$as_me:13031: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13797,7 +13845,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13900,7 +13949,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13965,7 +14015,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14058,7 +14109,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14123,7 +14175,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14189,7 +14242,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14255,7 +14309,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14330,7 +14385,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 14333 "configure"
+#line 14388 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14428,7 +14483,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 14431 "configure"
+#line 14486 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15255,11 +15310,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15258: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15313: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15262: \$? = $ac_status" >&5
+   echo "$as_me:15317: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15315,11 +15370,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15318: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15373: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15322: \$? = $ac_status" >&5
+   echo "$as_me:15377: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15696,7 +15751,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15746,7 +15802,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17347,11 +17404,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17350: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17407: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17354: \$? = $ac_status" >&5
+   echo "$as_me:17411: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -17580,11 +17637,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17583: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17640: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17587: \$? = $ac_status" >&5
+   echo "$as_me:17644: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -17640,11 +17697,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17643: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17700: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17647: \$? = $ac_status" >&5
+   echo "$as_me:17704: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18031,7 +18088,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18091,7 +18149,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19282,7 +19341,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19385,7 +19445,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19450,7 +19511,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19543,7 +19605,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19608,7 +19671,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19674,7 +19738,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19740,7 +19805,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19815,7 +19881,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 19818 "configure"
+#line 19884 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19913,7 +19979,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 19916 "configure"
+#line 19982 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -21856,7 +21922,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21947,7 +22014,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21997,7 +22065,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22463,7 +22532,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22517,7 +22587,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22710,7 +22781,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22793,7 +22865,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22887,7 +22960,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22952,7 +23026,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23035,7 +23110,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23089,7 +23165,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23188,7 +23265,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23286,7 +23364,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23368,7 +23447,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23442,7 +23522,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23518,7 +23599,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23680,7 +23762,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23827,7 +23910,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23973,7 +24057,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24144,7 +24229,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24295,7 +24381,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24463,7 +24550,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24505,7 +24593,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24562,7 +24651,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24728,7 +24818,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24834,7 +24925,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24873,7 +24965,7 @@
 	CFLAGS="$CFLAGS -Werror"
 fi
 
-                                                                                                                                                                                                                            ac_config_files="$ac_config_files Makefile include/Makefile include/parted/Makefile libparted/Makefile libparted/fs_ext2/Makefile libparted/fs_fat/Makefile libparted/fs_hfs/Makefile libparted/fs_jfs/Makefile libparted/fs_linux_swap/Makefile libparted/fs_ntfs/Makefile libparted/fs_reiserfs/Makefile libparted/fs_ufs/Makefile libparted/fs_xfs/Makefile m4/Makefile parted/Makefile partprobe/Makefile doc/Makefile debug/Makefile debug/clearfat/Makefile debug/test/Makefile po/Makefile.in parted.spec"
+                                                                                                                                                                                                                                      ac_config_files="$ac_config_files Makefile include/Makefile include/parted/Makefile libparted/Makefile libparted/fs_ext2/Makefile libparted/fs_fat/Makefile libparted/fs_hfs/Makefile libparted/fs_jfs/Makefile libparted/fs_linux_swap/Makefile libparted/fs_ntfs/Makefile libparted/fs_reiserfs/Makefile libparted/fs_ufs/Makefile libparted/fs_xfs/Makefile libparted/fs_amiga/Makefile m4/Makefile parted/Makefile partprobe/Makefile doc/Makefile debug/Makefile debug/clearfat/Makefile debug/test/Makefile po/Makefile.in parted.spec"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -25457,6 +25549,7 @@
   "libparted/fs_reiserfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES libparted/fs_reiserfs/Makefile" ;;
   "libparted/fs_ufs/Makefile" ) CONFIG_FILES="$CONFIG_FILES libparted/fs_ufs/Makefile" ;;
   "libparted/fs_xfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES libparted/fs_xfs/Makefile" ;;
+  "libparted/fs_amiga/Makefile" ) CONFIG_FILES="$CONFIG_FILES libparted/fs_amiga/Makefile" ;;
   "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
   "parted/Makefile" ) CONFIG_FILES="$CONFIG_FILES parted/Makefile" ;;
   "partprobe/Makefile" ) CONFIG_FILES="$CONFIG_FILES partprobe/Makefile" ;;
@@ -25807,6 +25900,11 @@
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@ -25845,12 +25943,6 @@
 	 fi;;
       esac
     done` || { (exit 1); exit 1; }
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
diff -Naur parted-1.6.9.orig/configure.in parted-1.6.9/configure.in
--- parted-1.6.9.orig/configure.in	2004-05-10 21:03:19.000000000 +0200
+++ parted-1.6.9/configure.in	2004-05-10 21:03:41.000000000 +0200
@@ -417,6 +417,7 @@
 libparted/fs_reiserfs/Makefile
 libparted/fs_ufs/Makefile
 libparted/fs_xfs/Makefile
+libparted/fs_amiga/Makefile
 m4/Makefile 
 parted/Makefile
 partprobe/Makefile
diff -Naur parted-1.6.9.orig/libparted/Makefile.am parted-1.6.9/libparted/Makefile.am
--- parted-1.6.9.orig/libparted/Makefile.am	2004-05-10 21:03:19.000000000 +0200
+++ parted-1.6.9/libparted/Makefile.am	2004-05-10 21:03:41.000000000 +0200
@@ -11,7 +11,8 @@
 		fs_ntfs			\
 		fs_reiserfs		\
 		fs_ufs			\
-		fs_xfs
+		fs_xfs			\
+		fs_amiga
 
 LIBS = @INTLLIBS@ @LIBS@
 
@@ -41,6 +42,7 @@
 			disk_dvh.c		\
 			disk_pc98.c		\
 			disk_sun.c		\
+			disk_amiga.c		\
 			@OS@.c
 
 EXTRA_libparted_la_SOURCES    = linux.c		\
@@ -57,7 +59,8 @@
 			fs_ntfs/libntfs.la		\
 			fs_reiserfs/libreiserfs.la	\
 			fs_ufs/libufs.la		\
-			fs_xfs/libxfs.la
+			fs_xfs/libxfs.la		\
+			fs_amiga/libamigafs.la
 
 EXTRA_DIST	      = mbr.s
 
diff -Naur parted-1.6.9.orig/libparted/Makefile.in parted-1.6.9/libparted/Makefile.in
--- parted-1.6.9.orig/libparted/Makefile.in	2004-05-10 21:03:19.000000000 +0200
+++ parted-1.6.9/libparted/Makefile.in	2004-05-10 21:03:41.000000000 +0200
@@ -167,7 +167,8 @@
 		fs_ntfs			\
 		fs_reiserfs		\
 		fs_ufs			\
-		fs_xfs
+		fs_xfs			\
+		fs_amiga
 
 
 partedincludedir = -I$(top_srcdir)/include
@@ -197,6 +198,7 @@
 			disk_dvh.c		\
 			disk_pc98.c		\
 			disk_sun.c		\
+			disk_amiga.c		\
 			@OS@.c
 
 
@@ -215,7 +217,8 @@
 			fs_ntfs/libntfs.la		\
 			fs_reiserfs/libreiserfs.la	\
 			fs_ufs/libufs.la		\
-			fs_xfs/libxfs.la
+			fs_xfs/libxfs.la		\
+			fs_amiga/libamigafs.la
 
 
 EXTRA_DIST = mbr.s
@@ -231,12 +234,12 @@
 libparted_la_DEPENDENCIES = fs_ext2/libext2.la fs_fat/libfat.la \
 	fs_hfs/libhfs.la fs_jfs/libjfs.la fs_linux_swap/liblinuxswap.la \
 	fs_ntfs/libntfs.la fs_reiserfs/libreiserfs.la fs_ufs/libufs.la \
-	fs_xfs/libxfs.la
+	fs_xfs/libxfs.la fs_amiga/libamigafs.la
 am_libparted_la_OBJECTS = crc32.lo constraint.lo debug.lo device.lo \
 	exception.lo filesys.lo geom.lo libparted.lo natmath.lo \
 	timer.lo disk.lo disk_bsd.lo disk_dos.lo disk_gpt.lo \
 	disk_loop.lo disk_mac.lo disk_dvh.lo disk_pc98.lo disk_sun.lo \
-	@OS@.lo
+	disk_amiga.lo @OS@.lo
 libparted_la_OBJECTS = $(am_libparted_la_OBJECTS)
 
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
@@ -245,14 +248,15 @@
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/@OS@.Plo ./$(DEPDIR)/constraint.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/crc32.Plo ./$(DEPDIR)/debug.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/device.Plo ./$(DEPDIR)/disk.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/disk_bsd.Plo ./$(DEPDIR)/disk_dos.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/disk_dvh.Plo ./$(DEPDIR)/disk_gpt.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/disk_loop.Plo ./$(DEPDIR)/disk_mac.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/disk_pc98.Plo ./$(DEPDIR)/disk_sun.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/exception.Plo ./$(DEPDIR)/filesys.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/geom.Plo ./$(DEPDIR)/gnu.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libparted.Plo ./$(DEPDIR)/linux.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/natmath.Plo ./$(DEPDIR)/timer.Plo
+@AMDEP_TRUE@	./$(DEPDIR)/disk_amiga.Plo ./$(DEPDIR)/disk_bsd.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/disk_dos.Plo ./$(DEPDIR)/disk_dvh.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/disk_gpt.Plo ./$(DEPDIR)/disk_loop.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/disk_mac.Plo ./$(DEPDIR)/disk_pc98.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/disk_sun.Plo ./$(DEPDIR)/exception.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/filesys.Plo ./$(DEPDIR)/geom.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/gnu.Plo ./$(DEPDIR)/libparted.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/linux.Plo ./$(DEPDIR)/natmath.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/timer.Plo
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -323,6 +327,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/device.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/disk.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/disk_amiga.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/disk_bsd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/disk_dos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/disk_dvh.Plo@am__quote@
diff -Naur parted-1.6.9.orig/libparted/disk_amiga.c parted-1.6.9/libparted/disk_amiga.c
--- parted-1.6.9.orig/libparted/disk_amiga.c	1970-01-01 01:00:00.000000000 +0100
+++ parted-1.6.9/libparted/disk_amiga.c	2004-05-10 21:03:41.000000000 +0200
@@ -0,0 +1,1260 @@
+/* -*- Mode: c; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+
+    libparted - a library for manipulating disk partitions
+    disk_amiga.c - libparted module to manipulate amiga RDB partition tables.
+    Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+    Contributor:  Sven Luther <luther@debian.org>
+*/
+
+#include "config.h"
+
+#include <string.h>
+
+#include <parted/parted.h>
+#include <parted/debug.h>
+#include <parted/endian.h>
+
+#if ENABLE_NLS
+#  include <libintl.h>
+#  define _(String) dgettext (PACKAGE, String)
+#else
+#  define _(String) (String)
+#endif /* ENABLE_NLS */
+
+/* String manipulation */
+static void _amiga_set_bstr (const char *cstr, char *bstr, int maxsize) {
+	int size = strlen (cstr);
+	int i;
+
+	if (size >= maxsize) return;
+	bstr[0] = size;
+	for (i = 0; i<size; i++) bstr[i+1] = cstr[i];
+}
+static const char * _amiga_get_bstr (char * bstr) {
+	char * cstr = bstr + 1;
+	int size = bstr[0];
+	
+	cstr[size] = '\0';
+	return cstr;
+}
+
+#define	IDNAME_RIGIDDISK	0x5244534B	/* 'RDSK' */
+#define IDNAME_BADBLOCK		0x42414442	/* 'BADB' */
+#define	IDNAME_PARTITION	0x50415254	/* 'PART' */
+#define IDNAME_FILESYSHEADER	0x46534844	/* 'FSHD' */
+#define IDNAME_LOADSEG		0x4C534547	/* 'LSEG' */
+#define IDNAME_BOOT		0x424f4f54	/* 'BOOT' */
+#define IDNAME_FREE		0xffffffff	
+
+static const char *
+_amiga_block_id (uint32_t id) {
+	switch (id) {
+		case IDNAME_RIGIDDISK :
+			return "RDSK";
+		case IDNAME_BADBLOCK :
+			return "BADB";
+		case IDNAME_PARTITION :
+			return "PART";
+		case IDNAME_FILESYSHEADER :
+			return "FSHD";
+		case IDNAME_LOADSEG :
+			return "LSEG";
+		case IDNAME_BOOT :
+			return "BOOT";
+		case IDNAME_FREE :
+			return "<free>";
+		default :
+			return "<unknown>";
+	}
+}
+static int
+_amiga_valid_block_id (uint32_t id) {
+	switch (id) {
+		case IDNAME_RIGIDDISK :
+		case IDNAME_BADBLOCK :
+		case IDNAME_PARTITION :
+		case IDNAME_FILESYSHEADER :
+		case IDNAME_LOADSEG :
+		case IDNAME_BOOT :
+			return 1;
+		case IDNAME_FREE :
+		default :
+			return 0;
+	}
+}
+
+struct AmigaIds {
+	uint32_t ID;
+	struct AmigaIds *next;
+};
+
+static struct AmigaIds *
+_amiga_add_id (uint32_t id, struct AmigaIds *ids) {
+	struct AmigaIds *newid;
+
+	if ((newid=ped_malloc(sizeof (struct AmigaIds)))==NULL) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate id list element\n"), __func__);
+		return 0;
+	}
+	newid->ID = id;
+	newid->next = ids;
+	return newid;
+}
+
+static void
+_amiga_free_ids (struct AmigaIds *ids) {
+	struct AmigaIds *current, *next;
+
+	for (current = ids; current != NULL; current = next) {
+		next = current->next;
+		ped_free (current);
+	}
+}
+static int
+_amiga_id_in_list (uint32_t id, struct AmigaIds *ids) {
+	struct AmigaIds *current;
+
+	for (current = ids; current != NULL; current = current->next) {
+		if (id == current->ID)
+			return 1;
+	}
+	return 0;
+}
+
+struct AmigaBlock {
+	uint32_t	amiga_ID;		/* Identifier 32 bit word */
+	uint32_t	amiga_SummedLongss;	/* Size of the structure for checksums */
+	int32_t		amiga_ChkSum;		/* Checksum of the structure */
+};
+#define AMIGA(pos) ((struct AmigaBlock *)(pos)) 
+
+static int
+_amiga_checksum (struct AmigaBlock *blk) {
+	uint32_t *rdb = (uint32_t *) blk;
+	uint32_t sum;
+	int i, end;
+
+	sum = PED_BE32_TO_CPU (rdb[0]);
+	end = PED_BE32_TO_CPU (rdb[1]);
+
+	if (end > PED_SECTOR_SIZE) end = PED_SECTOR_SIZE;
+
+	for (i = 1; i < end; i++) sum += PED_BE32_TO_CPU (rdb[i]);
+
+	return sum;
+}
+
+static void
+_amiga_calculate_checksum (struct AmigaBlock *blk) {
+	blk->amiga_ChkSum = PED_CPU_TO_BE32(
+		PED_BE32_TO_CPU(blk->amiga_ChkSum) -
+		_amiga_checksum((struct AmigaBlock *) blk));
+	return;	
+}
+
+static struct AmigaBlock *
+_amiga_read_block (PedDevice *dev, struct AmigaBlock *blk, PedSector block, struct AmigaIds *ids) {
+	if (!ped_device_read (dev, blk, block, 1)) {
+		ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Couldn't read block %llu\n"), __func__, block);
+		return NULL;
+	}
+	if (ids && !_amiga_id_in_list(PED_BE32_TO_CPU(blk->amiga_ID), ids))
+		return NULL;
+	if (_amiga_checksum (blk) != 0) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_FIX | PED_EXCEPTION_IGNORE | PED_EXCEPTION_CANCEL,
+			_("%s : Bad checksum on block %llu of type %s\n"),
+			__func__, block, _amiga_block_id(PED_BE32_TO_CPU(blk->amiga_ID))))
+		{
+			case PED_EXCEPTION_CANCEL :
+				return NULL;
+			case PED_EXCEPTION_FIX :
+				_amiga_calculate_checksum(AMIGA(blk));
+				if (!ped_device_write (dev, blk, block, 1)) {
+					ped_exception_throw(PED_EXCEPTION_FATAL, PED_EXCEPTION_CANCEL,
+						_("%s : Couldn't write block %d\n"), __func__, block);
+					return NULL;
+				}
+			case PED_EXCEPTION_IGNORE :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return blk;
+		}
+	}
+	return blk;
+}
+
+struct RigidDiskBlock {
+    uint32_t	rdb_ID;			/* Identifier 32 bit word : 'RDSK' */
+    uint32_t	rdb_SummedLongs;	/* Size of the structure for checksums */
+    int32_t	rdb_ChkSum;		/* Checksum of the structure */
+    uint32_t	rdb_HostID;		/* SCSI Target ID of host, not really used */
+    uint32_t	rdb_BlockBytes;		/* Size of disk blocks */
+    uint32_t	rdb_Flags;		/* RDB Flags */
+    /* block list heads */
+    uint32_t	rdb_BadBlockList;	/* Bad block list */
+    uint32_t	rdb_PartitionList;	/* Partition list */
+    uint32_t	rdb_FileSysHeaderList;	/* File system header list */
+    uint32_t	rdb_DriveInit;		/* Drive specific init code */
+    uint32_t	rdb_BootBlockList;	/* Amiga OS 4 Boot Blocks */
+    uint32_t	rdb_Reserved1[5];	/* Unused word, need to be set to $ffffffff */
+    /* physical drive characteristics */
+    uint32_t	rdb_Cylinders;		/* Number of the cylinders of the drive */
+    uint32_t	rdb_Sectors;		/* Number of sectors of the drive */
+    uint32_t	rdb_Heads;		/* Number of heads of the drive */
+    uint32_t	rdb_Interleave;		/* Interleave */
+    uint32_t	rdb_Park;		/* Head parking cylinder */
+    uint32_t	rdb_Reserved2[3];	/* Unused word, need to be set to $ffffffff */
+    uint32_t	rdb_WritePreComp;	/* Starting cylinder of write precompensation */
+    uint32_t	rdb_ReducedWrite;	/* Starting cylinder of reduced write current */
+    uint32_t	rdb_StepRate;		/* Step rate of the drive */
+    uint32_t	rdb_Reserved3[5];	/* Unused word, need to be set to $ffffffff */
+    /* logical drive characteristics */
+    uint32_t	rdb_RDBBlocksLo;	/* low block of range reserved for hardblocks */
+    uint32_t	rdb_RDBBlocksHi;	/* high block of range for these hardblocks */
+    uint32_t	rdb_LoCylinder;		/* low cylinder of partitionable disk area */
+    uint32_t	rdb_HiCylinder;		/* high cylinder of partitionable data area */
+    uint32_t	rdb_CylBlocks;		/* number of blocks available per cylinder */
+    uint32_t	rdb_AutoParkSeconds;	/* zero for no auto park */
+    uint32_t	rdb_HighRDSKBlock;	/* highest block used by RDSK */
+					/* (not including replacement bad blocks) */
+    uint32_t	rdb_Reserved4;
+    /* drive identification */
+    char	rdb_DiskVendor[8];
+    char	rdb_DiskProduct[16];
+    char	rdb_DiskRevision[4];
+    char	rdb_ControllerVendor[8];
+    char	rdb_ControllerProduct[16];
+    char	rdb_ControllerRevision[4];
+    uint32_t	rdb_Reserved5[10];
+};
+
+#define RDSK(pos) ((struct RigidDiskBlock *)(pos)) 
+
+#define AMIGA_RDB_NOT_FOUND ((uint32_t)0xffffffff)
+#define	RDB_LOCATION_LIMIT	16
+#define AMIGA_MAX_PARTITIONS 128
+#define MAX_RDB_BLOCK (RDB_LOCATION_LIMIT + 2 * AMIGA_MAX_PARTITIONS + 2)
+
+static uint32_t
+_amiga_find_rdb (PedDevice *dev, struct RigidDiskBlock *rdb) {
+	int i;
+	struct AmigaIds *ids;
+
+	ids = _amiga_add_id (IDNAME_RIGIDDISK, NULL);
+
+	for (i = 0; i<RDB_LOCATION_LIMIT; i++) {
+		if (!_amiga_read_block (dev, AMIGA(rdb), i, ids)) {
+			continue;
+		}
+		if (PED_BE32_TO_CPU (rdb->rdb_ID) == IDNAME_RIGIDDISK) {
+			_amiga_free_ids (ids);
+			return i;
+		}
+	}
+	_amiga_free_ids (ids);
+	return AMIGA_RDB_NOT_FOUND;
+}
+
+struct PartitionBlock {
+    uint32_t	pb_ID;			/* Identifier 32 bit word : 'PART' */
+    uint32_t	pb_SummedLongs;		/* Size of the structure for checksums */
+    int32_t	pb_ChkSum;		/* Checksum of the structure */
+    uint32_t	pb_HostID;		/* SCSI Target ID of host, not really used */
+    uint32_t	pb_Next;		/* Block number of the next PartitionBlock */
+    uint32_t	pb_Flags;		/* Part Flags (NOMOUNT and BOOTABLE) */
+    uint32_t	pb_Reserved1[2];
+    uint32_t	pb_DevFlags;		/* Preferred flags for OpenDevice */
+    uint8_t	pb_DriveName[32];	/* Preferred DOS device name: BSTR form */
+    uint32_t	pb_Reserved2[15];
+    uint32_t	de_TableSize;		/* Size of Environment vector */
+    uint32_t	de_SizeBlock;		/* Size of the blocks in 32 bit words, usually 128 */
+    uint32_t	de_SecOrg;	     	/* Not used; must be 0 */
+    uint32_t	de_Surfaces;		/* Number of heads (surfaces) */
+    uint32_t	de_SectorPerBlock;	/* Disk sectors per block, used with SizeBlock, usually 1 */
+    uint32_t	de_BlocksPerTrack;	/* Blocks per track. drive specific */
+    uint32_t	de_Reserved;		/* DOS reserved blocks at start of partition. */
+    uint32_t	de_PreAlloc;		/* DOS reserved blocks at end of partition */
+    uint32_t	de_Interleave;		/* Not used, usually 0 */
+    uint32_t	de_LowCyl;		/* First cylinder of the partition */
+    uint32_t	de_HighCyl;		/* Last cylinder of the partition */
+    uint32_t	de_NumBuffers;		/* Initial # DOS of buffers.  */
+    uint32_t	de_BufMemType;		/* Type of mem to allocate for buffers */
+    uint32_t	de_MaxTransfer;		/* Max number of bytes to transfer at a time */
+    uint32_t	de_Mask;		/* Address Mask to block out certain memory */
+    int32_t	de_BootPri;		/* Boot priority for autoboot */
+    uint32_t	de_DosType;		/* Dostype of the filesystem */
+    uint32_t	de_Baud;		/* Baud rate for serial handler */
+    uint32_t	de_Control;		/* Control word for handler/filesystem */
+    uint32_t	de_BootBlocks;		/* Number of blocks containing boot code */
+    uint32_t	pb_EReserved[12];
+};
+
+#define PART(pos) ((struct PartitionBlock *)(pos))
+
+#define	PBFB_BOOTABLE	0	/* this partition is intended to be bootable */
+#define	PBFF_BOOTABLE	1L	/*   (expected directories and files exist) */
+#define	PBFB_NOMOUNT	1	/* do not mount this partition (e.g. manually */
+#define	PBFF_NOMOUNT	2L	/*   mounted, but space reserved here) */
+
+
+struct LinkedBlock {
+    uint32_t	lk_ID;			/* Identifier 32 bit word */
+    uint32_t	lk_SummedLongs;		/* Size of the structure for checksums */
+    int32_t	lk_ChkSum;		/* Checksum of the structure */
+    uint32_t	pb_HostID;		/* SCSI Target ID of host, not really used */
+    uint32_t	lk_Next;		/* Block number of the next PartitionBlock */
+};
+struct Linked2Block {
+    uint32_t	lk2_ID;			/* Identifier 32 bit word */
+    uint32_t	lk2_SummedLongs;		/* Size of the structure for checksums */
+    int32_t	lk2_ChkSum;		/* Checksum of the structure */
+    uint32_t	lk2_Next;		/* Block number of the next PartitionBlock */
+    uint32_t	lk2_Reverved[13];
+    uint32_t	lk2_Linked;		/* Secondary linked list */
+};
+#define LINK_END	0xffffffff
+#define LNK(pos)	((struct LinkedBlock *)(pos))
+#define LNK2(pos)	((struct Linked2Block *)(pos))
+
+
+static PedDiskType amiga_disk_type;
+
+static int
+amiga_probe (PedDevice *dev)
+{
+	struct RigidDiskBlock *rdb;
+	uint32_t found;
+	PED_ASSERT(dev!= NULL, return 0);
+
+	if ((rdb=RDSK(ped_malloc(PED_SECTOR_SIZE)))==NULL) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate rdb block\n"), __func__);
+		return 0;
+	}
+	found = _amiga_find_rdb (dev, rdb);
+	ped_free (rdb);
+
+	return (found == AMIGA_RDB_NOT_FOUND ? 0 : 1);
+}
+		
+static PedDisk*
+amiga_alloc (PedDevice* dev)
+{
+	PedDisk *disk;
+	struct AmigaDisk *adsk;
+	struct RigidDiskBlock *rdb;
+	int highest_cylinder, highest_block;
+	PED_ASSERT(dev!= NULL, return NULL);
+
+	if (!(disk = _ped_disk_alloc (dev, &amiga_disk_type))) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate disk structure\n"), __func__);
+		return NULL;
+	}
+
+	if (!(disk->disk_specific = ped_malloc (PED_SECTOR_SIZE))) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate disk_specific rdb block\n"), __func__);
+		ped_free (disk);
+		return NULL;
+	}
+	rdb = disk->disk_specific;
+
+	memset(rdb, -1, sizeof(struct RigidDiskBlock));
+
+	rdb->rdb_ID = PED_CPU_TO_BE32 (IDNAME_RIGIDDISK);
+	rdb->rdb_SummedLongs = PED_CPU_TO_BE32 (64);
+	rdb->rdb_HostID = PED_CPU_TO_BE32 (0);
+	rdb->rdb_BlockBytes = PED_CPU_TO_BE32 (PED_SECTOR_SIZE);
+	rdb->rdb_Flags = PED_CPU_TO_BE32 (0);
+
+	/* Block lists */
+	rdb->rdb_BadBlockList = PED_CPU_TO_BE32 (LINK_END);
+	rdb->rdb_PartitionList = PED_CPU_TO_BE32 (LINK_END);
+	rdb->rdb_FileSysHeaderList = PED_CPU_TO_BE32 (LINK_END);
+	rdb->rdb_DriveInit = PED_CPU_TO_BE32 (LINK_END);
+	rdb->rdb_BootBlockList = PED_CPU_TO_BE32 (LINK_END);
+	
+	/* Physical drive characteristics */
+	rdb->rdb_Cylinders = PED_CPU_TO_BE32 (dev->cylinders);
+	rdb->rdb_Sectors = PED_CPU_TO_BE32 (dev->sectors);
+	rdb->rdb_Heads = PED_CPU_TO_BE32 (dev->heads);
+	rdb->rdb_Interleave = PED_CPU_TO_BE32 (0);
+	rdb->rdb_Park = PED_CPU_TO_BE32 (dev->cylinders);
+	rdb->rdb_WritePreComp = PED_CPU_TO_BE32 (dev->cylinders);
+	rdb->rdb_ReducedWrite = PED_CPU_TO_BE32 (dev->cylinders);
+	rdb->rdb_StepRate = PED_CPU_TO_BE32 (0);
+
+	highest_cylinder = MAX_RDB_BLOCK / (dev->sectors * dev->heads) + 1;
+	highest_block = highest_cylinder * dev->sectors * dev->heads - 1;
+
+	/* Logical driver characteristics */
+	rdb->rdb_RDBBlocksLo = PED_CPU_TO_BE32 (0);
+	rdb->rdb_RDBBlocksHi = PED_CPU_TO_BE32 (highest_block);
+	rdb->rdb_LoCylinder = PED_CPU_TO_BE32 (highest_cylinder);
+	rdb->rdb_HiCylinder = PED_CPU_TO_BE32 (dev->cylinders -1);
+	rdb->rdb_CylBlocks = PED_CPU_TO_BE32 (dev->sectors * dev->heads);
+	rdb->rdb_AutoParkSeconds = PED_CPU_TO_BE32 (0);
+	/* rdb_HighRDSKBlock will only be set when writing */
+	rdb->rdb_HighRDSKBlock = PED_CPU_TO_BE32 (0);
+
+	/* Driver identification */
+	_amiga_set_bstr("", rdb->rdb_DiskVendor, 8);
+	_amiga_set_bstr(dev->model, rdb->rdb_DiskProduct, 16);
+	_amiga_set_bstr("", rdb->rdb_DiskRevision, 4);
+	_amiga_set_bstr("", rdb->rdb_ControllerVendor, 8);
+	_amiga_set_bstr("", rdb->rdb_ControllerProduct, 16);
+	_amiga_set_bstr("", rdb->rdb_ControllerRevision, 4);
+
+	/* And calculate the checksum */
+	_amiga_calculate_checksum ((struct AmigaBlock *) rdb);
+	
+	return disk;
+}
+
+static PedDisk*
+amiga_duplicate (const PedDisk* disk)
+{
+	PedDisk*	new_disk;
+	struct RigidDiskBlock *	new_rdb;
+	struct RigidDiskBlock * old_rdb;
+	PED_ASSERT(disk!= NULL, return NULL);
+	PED_ASSERT(disk->dev!= NULL, return NULL);
+	PED_ASSERT(disk->disk_specific!= NULL, return NULL);
+
+	old_rdb = (struct RigidDiskBlock *) disk->disk_specific;
+       
+	if (!(new_disk = ped_disk_new_fresh (disk->dev, &amiga_disk_type))) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate a new disk structure\n"), __func__);
+		return NULL;
+	}
+
+	new_rdb = (struct RigidDiskBlock *) new_disk->disk_specific;
+	memcpy (new_rdb, old_rdb, 256);
+	return new_disk;
+}
+
+static void
+amiga_free (PedDisk* disk)
+{
+	PED_ASSERT(disk!= NULL, return);
+	PED_ASSERT(disk->disk_specific!= NULL, return);
+
+	ped_free (disk->disk_specific);
+	_ped_disk_free (disk);
+}
+
+#ifndef DISCOVER_ONLY
+static int
+amiga_clobber (PedDevice* dev)
+{
+	struct RigidDiskBlock *rdb;
+	uint32_t i;
+	int result = 0;
+	PED_ASSERT(dev!= NULL, return 0);
+
+	if ((rdb=RDSK(ped_malloc(PED_SECTOR_SIZE)))==NULL) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate rdb block\n"), __func__);
+		return 0;
+	}
+
+	while ((i = _amiga_find_rdb (dev, rdb)) != AMIGA_RDB_NOT_FOUND) {
+		rdb->rdb_ID = PED_CPU_TO_BE32 (0);
+		result = ped_device_write (dev, (void*) rdb, i, 1);
+	}
+
+	ped_free (rdb);
+
+	return result;
+}
+#endif /* !DISCOVER_ONLY */
+
+static int
+_amiga_loop_check (uint32_t block, uint32_t * blocklist, uint32_t max)
+{
+	uint32_t i;
+
+	for (i = 0; i < max; i++)
+		if (block == blocklist[i]) {
+			/* We are looping, let's stop.  */
+			return 1;
+		}
+	blocklist[max] = block;
+	return 0;
+}
+
+/* We have already allocated a rdb, we are now reading it from the disk */
+static int
+amiga_read (PedDisk* disk)
+{
+	struct RigidDiskBlock *rdb;
+	struct PartitionBlock *partition;
+	uint32_t partblock;
+	uint32_t partlist[AMIGA_MAX_PARTITIONS];
+	PedSector cylblocks;
+	int i;
+
+	PED_ASSERT(disk!= NULL, return 0);
+	PED_ASSERT(disk->dev!= NULL, return 0);
+	PED_ASSERT(disk->disk_specific!= NULL, return 0);
+	rdb = RDSK(disk->disk_specific);
+
+	if (_amiga_find_rdb (disk->dev, rdb) == AMIGA_RDB_NOT_FOUND) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Didn't find rdb block, should never happen\n"), __func__);
+		return 0;
+	}
+
+	/* Let's copy the rdb read geometry to the dev */
+	disk->dev->cylinders = PED_BE32_TO_CPU (rdb->rdb_Cylinders);
+	disk->dev->heads = PED_BE32_TO_CPU (rdb->rdb_Heads);
+	disk->dev->sectors = PED_BE32_TO_CPU (rdb->rdb_Sectors);
+	cylblocks = (PedSector) PED_BE32_TO_CPU (rdb->rdb_Heads) *
+		(PedSector) PED_BE32_TO_CPU (rdb->rdb_Sectors);
+
+	/* Remove all partitions in the former in memory table */
+	ped_disk_delete_all (disk);
+
+	/* Let's allocate a partition block */
+	if (!(partition = ped_malloc (PED_SECTOR_SIZE))) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate partition block\n"), __func__);
+		return 0;
+	}
+
+	/* We initialize the hardblock free list to detect loops */
+	for (i = 0; i < AMIGA_MAX_PARTITIONS; i++) partlist[i] = LINK_END;
+
+	for (i = 1, partblock = PED_BE32_TO_CPU(rdb->rdb_PartitionList);
+		i < AMIGA_MAX_PARTITIONS && partblock != LINK_END;
+		i++, partblock = PED_BE32_TO_CPU(partition->pb_Next))
+	{
+		PedPartition *part;
+		PedSector start, end;
+		struct DosEnvec *de;
+		PedConstraint *constraint_exact;
+		int j; 
+
+		/* Let's look for loops in the partition table */
+		if (_amiga_loop_check(partblock, partlist, i)) {
+			break;
+		}
+
+		/* Let's allocate and read a partition block to get its geometry*/
+		if (!_amiga_read_block (disk->dev, AMIGA(partition), (PedSector)partblock, NULL)) {
+			ped_free(partition);
+			return 0;
+		}
+
+		start = ((PedSector) PED_BE32_TO_CPU (partition->de_LowCyl)) * cylblocks;
+		end = ((((PedSector) PED_BE32_TO_CPU (partition->de_HighCyl))+1) * (cylblocks))-1;
+
+		/* We can now construct a new partition */
+		if (!(part = ped_partition_new (disk, 0, NULL, start, end))) {
+			ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+				_("%s : Failed to allocate new partition (%llu -> %llu)\n"),
+				__func__, start, end);
+			ped_free(partition);
+			return 0;
+		}
+		/* And copy over the partition block */
+		memcpy(part->disk_specific, partition, 256);
+
+		part->num = i;
+		part->type = 0;
+		/* Let's probe what filesystem is present on the disk */
+		part->fs_type = ped_file_system_probe (&part->geom);
+		
+		constraint_exact = ped_constraint_exact (&part->geom);
+		if (!ped_disk_add_partition (disk, part, constraint_exact)) {
+			ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+				_("%s : Failed to add new partition\n"), __func__);
+			ped_free(partition);
+			return 0;
+		}
+		ped_constraint_destroy (constraint_exact);
+	}
+	return 1;
+}
+
+static int
+_amiga_find_free_blocks(PedDisk *disk, uint32_t *table,
+	struct LinkedBlock *block, uint32_t first, uint32_t type)
+{
+	PedSector next;
+
+	PED_ASSERT(disk!= NULL, return 0);
+	PED_ASSERT(disk->dev!= NULL, return 0);
+
+	for (next = first; next != LINK_END; next = PED_BE32_TO_CPU(block->lk_Next)) {
+		if (table[next] != IDNAME_FREE) {
+			switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+				PED_EXCEPTION_FIX | PED_EXCEPTION_IGNORE | PED_EXCEPTION_CANCEL,
+				_("%s : Loop detected at block %d\n"), __func__, next))
+			{
+				case PED_EXCEPTION_CANCEL :
+					return 0;
+				case PED_EXCEPTION_FIX :
+					/* TODO : Need to add fixing code */
+				case PED_EXCEPTION_IGNORE :
+				case PED_EXCEPTION_UNHANDLED :
+				default : 
+					return 1;
+			}
+		}
+
+		if (!_amiga_read_block (disk->dev, AMIGA(block), next, NULL)) {
+			return 0;
+		}
+		if (PED_BE32_TO_CPU(block->lk_ID) != type) {
+			switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+				PED_EXCEPTION_CANCEL,
+				_("%s : The %s list seems bad at block %s\n"),
+				__func__, _amiga_block_id(PED_BE32_TO_CPU(block->lk_ID)), next))
+			{
+				/* TODO : to more subtile things here */
+				case PED_EXCEPTION_CANCEL :
+				case PED_EXCEPTION_UNHANDLED :
+				default : 
+					return 0;
+			}
+		}
+		table[next] = type;
+		if (PED_BE32_TO_CPU(block->lk_ID) == IDNAME_FILESYSHEADER) {
+			if (_amiga_find_free_blocks(disk, table, block,
+				PED_BE32_TO_CPU(LNK2(block)->lk2_Linked),
+				IDNAME_LOADSEG) == 0) return 0;
+		}
+	}
+	return 1;
+}
+static uint32_t
+_amiga_next_free_block(uint32_t *table, uint32_t start, uint32_t type) {
+	int i;
+
+	for (i = start; table[i] != type && table[i] != IDNAME_FREE; i++);
+	return i;
+}
+static PedPartition *
+_amiga_next_real_partition(PedDisk *disk, PedPartition *part) {
+	PedPartition *next;
+
+	for (next = ped_disk_next_partition (disk, part);
+		next != NULL && !ped_partition_is_active (next);
+		next = ped_disk_next_partition (disk, next));
+	return next;
+}
+#ifndef DISCOVER_ONLY
+static int
+amiga_write (PedDisk* disk)
+{
+	struct RigidDiskBlock *rdb;
+	struct LinkedBlock *block;
+	struct PartitionBlock *partition;
+	PedPartition *part, *next_part;
+	PedSector cylblocks, first_hb, last_hb, last_used_hb;
+	uint32_t * table;
+	uint32_t i, rdb_block, max_part;
+	uint32_t rdb_num, part_num, block_num, next_num;
+
+	PED_ASSERT (disk != NULL, return 0;);
+	PED_ASSERT (disk->dev != NULL, return 0;);
+	PED_ASSERT (disk->disk_specific != NULL, return 0;);
+
+	if (!(rdb = ped_malloc (PED_SECTOR_SIZE))) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate rdb block\n"), __func__);
+		return 0;
+	}
+	/* Let's read the rdb */
+	if ((rdb_num = _amiga_find_rdb (disk->dev, rdb)) == AMIGA_RDB_NOT_FOUND) {
+		rdb_num = 2;
+	} else {
+		memcpy (RDSK(disk->disk_specific), rdb, PED_SECTOR_SIZE);
+	}
+	ped_free (rdb);
+	rdb = RDSK(disk->disk_specific);
+
+	/* Let's copy the rdb read geometry to the dev */
+	disk->dev->cylinders = PED_BE32_TO_CPU (rdb->rdb_Cylinders);
+	disk->dev->heads = PED_BE32_TO_CPU (rdb->rdb_Heads);
+	disk->dev->sectors = PED_BE32_TO_CPU (rdb->rdb_Sectors);
+	cylblocks = (PedSector) PED_BE32_TO_CPU (rdb->rdb_Heads) *
+		(PedSector) PED_BE32_TO_CPU (rdb->rdb_Sectors);
+	first_hb = (PedSector) PED_BE32_TO_CPU (rdb->rdb_RDBBlocksLo);
+	last_hb = (PedSector) PED_BE32_TO_CPU (rdb->rdb_RDBBlocksHi);
+	last_used_hb = (PedSector) PED_BE32_TO_CPU (rdb->rdb_HighRDSKBlock);
+
+	/* let's allocate a free block table and initialize it */
+	if (!(table = ped_malloc ((last_hb - first_hb + 1) * sizeof(uint32_t)))) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate free block table\n"), __func__);
+		return 0;
+	}
+	memset(table, 0xff, (last_hb - first_hb + 1) * sizeof(uint32_t));
+	for (i = 0; i<=rdb_num; i++) table[i] = IDNAME_RIGIDDISK;
+	
+	/* Let's allocate a partition block */
+	if (!(block = ped_malloc (PED_SECTOR_SIZE))) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate partition block\n"), __func__);
+		ped_free (table);
+		return 0;
+	}
+
+	/* And fill the free block table */
+	if (_amiga_find_free_blocks(disk, table, block,
+		PED_BE32_TO_CPU (rdb->rdb_BadBlockList), IDNAME_BADBLOCK) == 0)
+	{
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to list badblocks\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				ped_free (table);
+				ped_free (block);
+				return 0;
+		}
+	}
+	if (_amiga_find_free_blocks(disk, table, block,
+		PED_BE32_TO_CPU (rdb->rdb_PartitionList), IDNAME_PARTITION) == 0)
+	{
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to list partitionblocks\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				ped_free (table);
+				ped_free (block);
+				return 0;
+		}
+	}
+	if (_amiga_find_free_blocks(disk, table, block,
+		PED_BE32_TO_CPU (rdb->rdb_FileSysHeaderList), IDNAME_FILESYSHEADER) == 0)
+	{
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to list filesystemblocks\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				ped_free (table);
+				ped_free (block);
+				return 0;
+		}
+	}
+	if (_amiga_find_free_blocks(disk, table, block,
+		PED_BE32_TO_CPU (rdb->rdb_BootBlockList), IDNAME_BOOT) == 0)
+	{
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to list bootblocks\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				ped_free (table);
+				ped_free (block);
+				return 0;
+		}
+	}
+
+	block_num = next_num = part_num = _amiga_next_free_block(table, rdb_num+1, IDNAME_PARTITION);
+	part = _amiga_next_real_partition(disk, NULL);
+	if (part == NULL) {
+		rdb->rdb_PartitionList = PED_CPU_TO_BE32(LINK_END);
+	} else {
+		rdb->rdb_PartitionList = PED_CPU_TO_BE32(part_num);
+		while (part != NULL) {
+			PED_ASSERT(part->disk_specific!=NULL, return 0);
+			next_part = _amiga_next_real_partition(disk, part);
+			block_num = next_num;
+			next_num = _amiga_next_free_block(table, block_num+1, IDNAME_PARTITION);
+			partition = PART(part->disk_specific);
+			partition->pb_Next = next_part==NULL ? PED_CPU_TO_BE32(LINK_END):PED_CPU_TO_BE32(next_num);
+			partition->de_LowCyl = PED_CPU_TO_BE32(part->geom.start/cylblocks);
+			partition->de_HighCyl = PED_CPU_TO_BE32((part->geom.end+1)/cylblocks-1);
+			_amiga_calculate_checksum(AMIGA(partition));
+			if (!ped_device_write (disk->dev, (void*) partition, block_num, 1)) {
+				switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+					PED_EXCEPTION_CANCEL,
+					_("%s : Failed to write partition block at\n"), __func__, block_num))
+				{
+					case PED_EXCEPTION_CANCEL :
+					case PED_EXCEPTION_UNHANDLED :
+					default : 
+						ped_free (table);
+						ped_free (block);
+						/* WARNING : If we fail here, we stop everything,
+						 * and the partition table is lost. A Better
+						 * solution should be found, using the second
+						 * half of the hardblocks to not overwrite the
+						 * old partition table. It becomes problematic
+						 * if we use more than half of the hardblocks. */
+						return 0;
+				}
+			}
+			part = next_part;
+		}
+	}
+	if (block_num >PED_BE32_TO_CPU (rdb->rdb_HighRDSKBlock)) {
+		rdb->rdb_HighRDSKBlock = PED_CPU_TO_BE32(block_num);
+	}
+	_amiga_calculate_checksum(AMIGA(rdb));
+	if (!ped_device_write (disk->dev, (void*) disk->disk_specific, rdb_num, 1)) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to write rdb block at\n"), __func__, rdb_num))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				ped_free (table);
+				ped_free (block);
+				return 0;
+		}
+	}
+			
+	ped_free (table);
+	ped_free (block);
+	return ped_device_sync (disk->dev);
+}
+#endif /* !DISCOVER_ONLY */
+
+static PedPartition*
+amiga_partition_new (const PedDisk* disk, PedPartitionType part_type,
+		   const PedFileSystemType* fs_type,
+		   PedSector start, PedSector end)
+{
+	PedPartition *part;
+	PedDevice *dev;
+	PedSector cyl;
+	struct PartitionBlock *partition;
+	struct RigidDiskBlock *rdb;
+
+	PED_ASSERT(disk!= NULL, return NULL);
+	PED_ASSERT(disk->dev!= NULL, return NULL);
+	PED_ASSERT(disk->disk_specific!= NULL, return NULL);
+	dev = disk->dev;
+	cyl = (PedSector) (dev->sectors * dev->heads);
+	rdb = RDSK(disk->disk_specific);
+
+	if (!(part = _ped_partition_alloc (disk, part_type, fs_type, start, end))) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate a partition structure (%llu, %llu)"),
+			__func__, start, end);
+		return NULL;
+	}
+	
+
+	if (ped_partition_is_active (part)) {
+		if (!(part->disk_specific = ped_malloc (PED_SECTOR_SIZE))) {
+			ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+				_("%s : Failed to allocate a partition disk_specific block\n"), __func__);
+			ped_free (part);
+			return NULL;
+		}
+		partition = PART(part->disk_specific);
+		memset(partition, -1, sizeof(struct PartitionBlock));
+
+		partition->pb_ID = PED_CPU_TO_BE32(IDNAME_PARTITION);
+		partition->pb_SummedLongs = PED_CPU_TO_BE32(64);
+		partition->pb_HostID = rdb->rdb_HostID;
+		partition->pb_Flags = PED_CPU_TO_BE32(0);
+		/* TODO : use a scheme including the device name and the
+		 * partition number, if it is possible */
+		_amiga_set_bstr("dhx", partition->pb_DriveName, 32);
+
+		partition->de_TableSize = PED_CPU_TO_BE32(19);
+		partition->de_SizeBlock = PED_CPU_TO_BE32(128);
+		partition->de_SecOrg = PED_CPU_TO_BE32(0);
+		partition->de_Surfaces = PED_CPU_TO_BE32(dev->heads);
+		partition->de_SectorPerBlock = PED_CPU_TO_BE32(1);
+		partition->de_BlocksPerTrack = PED_CPU_TO_BE32(dev->sectors);
+		partition->de_Reserved = PED_CPU_TO_BE32(2);
+		partition->de_PreAlloc = PED_CPU_TO_BE32(0);
+		partition->de_Interleave = PED_CPU_TO_BE32(0);
+		partition->de_LowCyl = PED_CPU_TO_BE32(start/cyl);
+		partition->de_HighCyl = PED_CPU_TO_BE32((end+1)/cyl-1);
+		partition->de_NumBuffers = PED_CPU_TO_BE32(30);
+		partition->de_BufMemType = PED_CPU_TO_BE32(0);
+		partition->de_MaxTransfer = PED_CPU_TO_BE32(0x7fffffff);
+		partition->de_Mask = PED_CPU_TO_BE32(0xffffffff);
+		partition->de_BootPri = PED_CPU_TO_BE32(0);
+		partition->de_DosType = PED_CPU_TO_BE32(0x4c4e5800);
+		partition->de_Baud = PED_CPU_TO_BE32(0);
+		partition->de_Control = PED_CPU_TO_BE32(0);
+		partition->de_BootBlocks = PED_CPU_TO_BE32(0);
+
+	} else {
+		part->disk_specific = NULL;
+	}
+	return part;
+}
+
+static PedPartition*
+amiga_partition_duplicate (const PedPartition* part)
+{
+	PedPartition *new_part;
+	struct PartitionBlock *new_amiga_part;
+	struct PartitionBlock *old_amiga_part;
+
+	PED_ASSERT(part!= NULL, return NULL);
+	PED_ASSERT(part->disk!= NULL, return NULL);
+	PED_ASSERT(part->disk_specific!= NULL, return NULL);
+	old_amiga_part = (struct PartitionBlock *) part->disk_specific;
+
+	new_part = ped_partition_new (part->disk, part->type,
+				      part->fs_type, part->geom.start,
+				      part->geom.end);
+	if (!new_part) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate a new partition structure\n"), __func__);
+		return NULL;
+	}
+
+	new_amiga_part = (struct PartitionBlock *) new_part->disk_specific;
+	memcpy (new_amiga_part, old_amiga_part, 256);
+
+	return new_part;
+}
+
+static void
+amiga_partition_destroy (PedPartition* part)
+{
+	PED_ASSERT (part != NULL, return);
+
+	if (ped_partition_is_active (part)) {
+		PED_ASSERT (part->disk_specific!= NULL, return);
+		ped_free (part->disk_specific);
+	}
+	_ped_partition_free (part);
+}
+
+static int
+amiga_partition_set_system (PedPartition* part, const PedFileSystemType* fs_type)
+{
+	struct PartitionBlock *partition;
+
+	PED_ASSERT (part != NULL, return 0);
+	PED_ASSERT (part->disk_specific != NULL, return 0);
+	partition = PART(part->disk_specific);
+
+	part->fs_type = fs_type;
+
+	if (!fs_type)
+		partition->de_DosType = PED_CPU_TO_BE32(0x4c4e5800); /* 'LNX\0' */
+	else if (!strcmp (fs_type->name, "ext2"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x4c4e5800); /* 'LNX\0' */
+	else if (!strcmp (fs_type->name, "ext3"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x45585403); /* 'EXT\3' */
+	else if (!strcmp (fs_type->name, "linux-swap"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x53575000); /* 'SWP\0' */
+	else if (!strcmp (fs_type->name, "fat16"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x46415400); /* 'FAT\0' */
+	else if (!strcmp (fs_type->name, "fat32"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x46415401); /* 'FAT\1'*/
+	else if (!strcmp (fs_type->name, "hfs"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x48465300); /* 'HFS\0' */
+	else if (!strcmp (fs_type->name, "jfs"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x4a465300); /* 'JFS\0' */
+	else if (!strcmp (fs_type->name, "ntfs"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x4e544653); /* 'NTFS' */
+	else if (!strcmp (fs_type->name, "reiserfs"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x52465300); /* 'RFS\0' */
+	else if (!strcmp (fs_type->name, "sun-ufs"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x53554653); /* 'SUFS' */
+	else if (!strcmp (fs_type->name, "hp-ufs"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x48554653); /* 'HUFS' */
+	else if (!strcmp (fs_type->name, "xfs"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x58465300); /* 'XFS\0' */
+	else
+		partition->de_DosType = PED_CPU_TO_BE32(0x00000000); /* unknown */
+	return 1;
+}
+
+static int
+amiga_partition_set_flag (PedPartition* part, PedPartitionFlag flag, int state)
+{
+	struct PartitionBlock *partition;
+
+	PED_ASSERT (part != NULL, return 0);
+	PED_ASSERT (part->disk_specific != NULL, return 0);
+
+	partition = PART(part->disk_specific);
+
+	switch (flag) {
+		case PED_PARTITION_BOOT:
+			if (state) partition->pb_Flags |= PED_CPU_TO_BE32(PBFF_BOOTABLE);
+			else partition->pb_Flags &= ~(PED_CPU_TO_BE32(PBFF_BOOTABLE));
+			return 1;
+		case PED_PARTITION_HIDDEN:
+			if (state) partition->pb_Flags |= PED_CPU_TO_BE32(PBFF_NOMOUNT);
+			else partition->pb_Flags &= ~(PED_CPU_TO_BE32(PBFF_NOMOUNT));
+			return 1;
+		default:
+			return 0;
+	}
+}
+
+static int
+amiga_partition_get_flag (const PedPartition* part, PedPartitionFlag flag)
+{
+	struct PartitionBlock *partition;
+
+	PED_ASSERT (part != NULL, return 0);
+	PED_ASSERT (part->disk_specific != NULL, return 0);
+
+	partition = PART(part->disk_specific);
+
+	switch (flag) {
+		case PED_PARTITION_BOOT:
+			return (partition->pb_Flags & PED_CPU_TO_BE32(PBFF_BOOTABLE));
+		case PED_PARTITION_HIDDEN:
+			return (partition->pb_Flags & PED_CPU_TO_BE32(PBFF_NOMOUNT));
+		default:
+			return 0;
+	}
+}
+
+static int
+amiga_partition_is_flag_available (const PedPartition* part,
+				 PedPartitionFlag flag)
+{
+	switch (flag) {
+	case PED_PARTITION_BOOT:
+	case PED_PARTITION_HIDDEN:
+		return 1;
+	default:
+		return 0;
+	}
+}
+
+static void             
+amiga_partition_set_name (PedPartition* part, const char* name)
+{               
+	struct PartitionBlock *partition;
+
+	PED_ASSERT (part != NULL, return);
+	PED_ASSERT (part->disk_specific != NULL, return);
+
+	partition = PART(part->disk_specific);
+	_amiga_set_bstr(name, partition->pb_DriveName, 32);
+}
+static const char*
+amiga_partition_get_name (const PedPartition* part)
+{
+	struct PartitionBlock *partition;
+
+	PED_ASSERT (part != NULL, return 0);
+	PED_ASSERT (part->disk_specific != NULL, return 0);
+
+	partition = PART(part->disk_specific);
+
+	return _amiga_get_bstr(partition->pb_DriveName);
+}
+
+static PedConstraint*
+_amiga_get_constraint (const PedDisk *disk)
+{
+	PedDevice *dev = disk->dev;
+	PedAlignment start_align, end_align;
+	PedGeometry max_geom;
+	struct RigidDiskBlock *rdb = RDSK(disk->disk_specific);
+	PedSector cyl = (PedSector) PED_BE32_TO_CPU(rdb->rdb_Sectors) *
+		PED_BE32_TO_CPU(rdb->rdb_Heads);
+	PedSector start = ((273 / cyl) + 1) * cyl;
+	PedSector length = dev->length - start;
+	PedSector max_part = (length / cyl) * cyl;
+
+	if (!ped_alignment_init(&start_align, 0, cyl)) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to initialize the start constraint\n"), __func__);
+		return NULL;
+	}
+	if (!ped_alignment_init(&end_align, -1, cyl)) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to initialize the end constraint\n"), __func__);
+		return NULL;
+	}
+	if (!ped_geometry_init(&max_geom, dev, start, length)) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to initialize the max constraint\n"), __func__);
+		return NULL;
+	}
+
+	return ped_constraint_new (&start_align, &end_align,
+		&max_geom, &max_geom, cyl, max_part);
+}
+
+static int
+amiga_partition_align (PedPartition* part, const PedConstraint* constraint)
+{
+
+	PED_ASSERT (part != NULL, return 0);
+	PED_ASSERT (part->disk != NULL, return 0);
+	
+	if (_ped_partition_attempt_align (part, constraint,
+					  _amiga_get_constraint (part->disk)))
+	{
+	       	return 1;
+	}
+
+#ifndef DISCOVER_ONLY
+	ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+		_("%s : Unable to satisfy all constraints on the partition."), __func__);
+#endif
+	return 0;
+}
+
+static int
+amiga_partition_enumerate (PedPartition* part)
+{
+	
+	int i;
+	PedPartition* p;
+	
+	PED_ASSERT (part != NULL, return 0);
+	PED_ASSERT (part->disk != NULL, return 0);
+
+	/* never change the partition numbers */
+	if (part->num != -1)
+		return 1;
+	for (i = 1; i <= AMIGA_MAX_PARTITIONS; i++) {
+		p = ped_disk_get_partition (part->disk, i);
+		if (!p) {
+			part->num = i;
+			return 1;
+		}
+	}
+
+	/* failed to allocate a number */
+#ifndef DISCOVER_ONLY
+	ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+		_("%s : Unable to allocate a partition"), __func__);
+#endif
+	return 0;
+}
+
+static int
+amiga_alloc_metadata (PedDisk* disk)
+{
+	PedPartition*		new_part;
+	PedConstraint*		constraint_any = NULL;
+	PedSector		highest_block;
+
+	PED_ASSERT (disk != NULL, goto error);
+	PED_ASSERT (disk->dev != NULL, goto error);
+
+	constraint_any = ped_constraint_any (disk->dev);
+
+	/* Allocate space for the RDB */
+	new_part = ped_partition_new (disk, PED_PARTITION_METADATA, NULL, 0, MAX_RDB_BLOCK);
+	if (!new_part)
+		goto error;
+
+	if (!ped_disk_add_partition (disk, new_part, constraint_any)) {
+		ped_partition_destroy (new_part);
+		goto error;
+	}
+
+	ped_constraint_destroy (constraint_any);
+	return 1;
+error:
+	ped_constraint_destroy (constraint_any);
+	return 0;
+}
+
+static int
+amiga_get_max_primary_partition_count (const PedDisk* disk)
+{
+	return AMIGA_MAX_PARTITIONS;
+}
+
+static PedDiskOps amiga_disk_ops = {
+	probe:			amiga_probe,
+#ifndef DISCOVER_ONLY
+	clobber:		amiga_clobber,
+#else
+	clobber:		NULL,
+#endif
+	alloc:			amiga_alloc,
+	duplicate:		amiga_duplicate,
+	free:			amiga_free,
+	read:			amiga_read,
+#ifndef DISCOVER_ONLY
+	write:			amiga_write,
+#else
+	write:			NULL,
+#endif
+
+	partition_new:		amiga_partition_new,
+	partition_duplicate:	amiga_partition_duplicate,
+	partition_destroy:	amiga_partition_destroy,
+	partition_set_system:	amiga_partition_set_system,
+	partition_set_flag:	amiga_partition_set_flag,
+	partition_get_flag:	amiga_partition_get_flag,
+	partition_is_flag_available:
+				amiga_partition_is_flag_available,
+	partition_set_name:	amiga_partition_set_name,
+	partition_get_name:	amiga_partition_get_name,
+	partition_align:	amiga_partition_align,
+	partition_enumerate:	amiga_partition_enumerate,
+
+
+	alloc_metadata:		amiga_alloc_metadata,
+	get_max_primary_partition_count:
+				amiga_get_max_primary_partition_count
+};
+
+static PedDiskType amiga_disk_type = {
+	next:		NULL,
+	name:		"amiga",
+	ops:		&amiga_disk_ops,
+	features:	PED_DISK_TYPE_PARTITION_NAME
+};
+
+void
+ped_disk_amiga_init ()
+{
+	PED_ASSERT(sizeof(struct AmigaBlock) != 3, return);
+	PED_ASSERT(sizeof(struct RigidDiskBlock) != 64, return);
+	PED_ASSERT(sizeof(struct PartitionBlock) != 64, return);
+	PED_ASSERT(sizeof(struct LinkedBlock) != 5, return);
+	PED_ASSERT(sizeof(struct Linked2Block) != 18, return);
+
+	ped_register_disk_type (&amiga_disk_type);
+}
+
+void
+ped_disk_amiga_done ()
+{
+
+	ped_unregister_disk_type (&amiga_disk_type);
+}
diff -Naur parted-1.6.9.orig/libparted/disk_amiga.c.2 parted-1.6.9/libparted/disk_amiga.c.2
--- parted-1.6.9.orig/libparted/disk_amiga.c.2	1970-01-01 01:00:00.000000000 +0100
+++ parted-1.6.9/libparted/disk_amiga.c.2	2004-05-10 21:03:41.000000000 +0200
@@ -0,0 +1,1524 @@
+/* -*- Mode: c; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+
+    libparted - a library for manipulating disk partitions
+    Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+    Contributor:  Sven Luther <luther@debian.org>
+*/
+
+#include "config.h"
+
+#include <string.h>
+
+#include <parted/parted.h>
+#include <parted/debug.h>
+#include <parted/endian.h>
+
+#if ENABLE_NLS
+#  include <libintl.h>
+#  define _(String) dgettext (PACKAGE, String)
+#else
+#  define _(String) (String)
+#endif /* ENABLE_NLS */
+
+#define DEBUG_BLOCK	0x01
+#define DEBUG_CONST	0x02
+#define DEBUG_FUNCS	0x04
+#define DEBUG_ERROR	0x08
+#define DEBUG_READ	0X10
+#define DEBUG_WRITE	0X20
+#if 0
+#define MASTER_DEBUG DEBUG_BLOCK | DEBUG_CONST | DEBUG_FUNCS | DEBUG_ERROR | DEBUG_READ | DEBUG_WRITE
+#endif
+
+#ifdef MASTER_DEBUG
+#define DPRINT(l,a,b...) do { if ((l) & (MASTER_DEBUG)) fprintf(stderr, "AMIGA : %s: " a, __func__ , ## b); } while (0) 
+#define DPRINTF(l,a,b...) do { if ((l) & (MASTER_DEBUG)) fprintf(stderr, a, ## b); } while (0) 
+#define TRACE() DPRINT(DEBUG_FUNCS, "\n")
+#else 
+#define DPRINT(l,a,b...)
+#define DPRINTF(l,a,b...)
+#define TRACE()
+#endif /* MASTER_DEBUG */
+
+/* String manipulation */
+static void _amiga_set_bstr (const char *cstr, char *bstr, int maxsize) {
+	int size = strlen (cstr);
+	int i;
+	TRACE();
+
+	if (size >= maxsize) return;
+	bstr[0] = size;
+	for (i = 0; i<size; i++) bstr[i+1] = cstr[i];
+}
+static const char * _amiga_get_bstr (char * bstr) {
+	char * cstr = bstr + 1;
+	int size = bstr[0];
+	TRACE();
+	
+	cstr[size] = '\0';
+	return cstr;
+}
+
+#define	IDNAME_RIGIDDISK	0x5244534B	/* 'RDSK' */
+#define IDNAME_BADBLOCK		0x42414442	/* 'BADB' */
+#define	IDNAME_PARTITION	0x50415254	/* 'PART' */
+#define IDNAME_FILESYSHEADER	0x46534844	/* 'FSHD' */
+#define IDNAME_LOADSEG		0x4C534547	/* 'LSEG' */
+#define IDNAME_BOOT		0x424f4f54	/* 'BOOT' */
+#define IDNAME_FREE		0xffffffff	
+
+static const char *
+_amiga_block_id (uint32_t id) {
+	TRACE();
+	switch (id) {
+		case IDNAME_RIGIDDISK :
+			return "RDSK";
+		case IDNAME_BADBLOCK :
+			return "BADB";
+		case IDNAME_PARTITION :
+			return "PART";
+		case IDNAME_FILESYSHEADER :
+			return "FSHD";
+		case IDNAME_LOADSEG :
+			return "LSEG";
+		case IDNAME_BOOT :
+			return "BOOT";
+		case IDNAME_FREE :
+			return "<free>";
+		default :
+			return "<unknown>";
+	}
+}
+static int
+_amiga_valid_block_id (uint32_t id) {
+	TRACE();
+	switch (id) {
+		case IDNAME_RIGIDDISK :
+		case IDNAME_BADBLOCK :
+		case IDNAME_PARTITION :
+		case IDNAME_FILESYSHEADER :
+		case IDNAME_LOADSEG :
+		case IDNAME_BOOT :
+			return 1;
+		case IDNAME_FREE :
+		default :
+			return 0;
+	}
+}
+struct AmigaBlock {
+    uint32_t	amiga_ID;		/* Identifier 32 bit word */
+    uint32_t	amiga_SummedLongss;	/* Size of the structure for checksums */
+    int32_t	amiga_ChkSum;		/* Checksum of the structure */
+};
+#define AMIGA(pos) ((struct AmigaBlock *)(pos)) 
+
+static int
+_amiga_checksum (struct AmigaBlock *blk) {
+	uint32_t *rdb = (uint32_t *) blk;
+	uint32_t sum;
+	int i, end;
+	TRACE();
+
+	sum = PED_BE32_TO_CPU (rdb[0]);
+	end = PED_BE32_TO_CPU (rdb[1]);
+
+	if (end > PED_SECTOR_SIZE) end = PED_SECTOR_SIZE;
+
+	for (i = 1; i < end; i++) sum += PED_BE32_TO_CPU (rdb[i]);
+
+	return sum;
+}
+
+static void
+_amiga_calculate_checksum (struct AmigaBlock *blk) {
+	TRACE();
+	blk->amiga_ChkSum = PED_CPU_TO_BE32(
+		PED_BE32_TO_CPU(blk->amiga_ChkSum) -
+		_amiga_checksum((struct AmigaBlock *) blk));
+	return;	
+}
+
+static struct AmigaBlock *
+_amiga_read_block (PedDevice *dev, struct AmigaBlock *blk, PedSector block) {
+	if (!ped_device_read (dev, blk, block, 1)) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Couldn't read block %llu\n"), __func__, block))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return NULL;
+		}
+	}
+	if (_amiga_checksum (blk) != 0) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_FIX | PED_EXCEPTION_IGNORE | PED_EXCEPTION_CANCEL,
+			_("%s : Bad checksum on block %llu of type %s\n"),
+			__func__, block, _amiga_block_id(PED_BE32_TO_CPU(blk->amiga_ID))))
+		{
+			case PED_EXCEPTION_CANCEL :
+				return NULL;
+			case PED_EXCEPTION_FIX :
+				_amiga_calculate_checksum(AMIGA(blk));
+				if (!ped_device_write (dev, blk, block, 1)) {
+					switch (ped_exception_throw(PED_EXCEPTION_FATAL,
+						PED_EXCEPTION_CANCEL,
+						_("%s : Couldn't write block %d\n"), __func__, block))
+					{
+						case PED_EXCEPTION_CANCEL :
+						case PED_EXCEPTION_UNHANDLED :
+						default : 
+							return NULL;
+					}
+				}
+			case PED_EXCEPTION_IGNORE :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return blk;
+		}
+	}
+	return blk;
+}
+
+struct RigidDiskBlock {
+    uint32_t	rdb_ID;			/* Identifier 32 bit word : 'RDSK' */
+    uint32_t	rdb_SummedLongs;	/* Size of the structure for checksums */
+    int32_t	rdb_ChkSum;		/* Checksum of the structure */
+    uint32_t	rdb_HostID;		/* SCSI Target ID of host, not really used */
+    uint32_t	rdb_BlockBytes;		/* Size of disk blocks */
+    uint32_t	rdb_Flags;		/* RDB Flags */
+    /* block list heads */
+    uint32_t	rdb_BadBlockList;	/* Bad block list */
+    uint32_t	rdb_PartitionList;	/* Partition list */
+    uint32_t	rdb_FileSysHeaderList;	/* File system header list */
+    uint32_t	rdb_DriveInit;		/* Drive specific init code */
+    uint32_t	rdb_BootBlockList;	/* Amiga OS 4 Boot Blocks */
+    uint32_t	rdb_Reserved1[5];	/* Unused word, need to be set to $ffffffff */
+    /* physical drive characteristics */
+    uint32_t	rdb_Cylinders;		/* Number of the cylinders of the drive */
+    uint32_t	rdb_Sectors;		/* Number of sectors of the drive */
+    uint32_t	rdb_Heads;		/* Number of heads of the drive */
+    uint32_t	rdb_Interleave;		/* Interleave */
+    uint32_t	rdb_Park;		/* Head parking cylinder */
+    uint32_t	rdb_Reserved2[3];	/* Unused word, need to be set to $ffffffff */
+    uint32_t	rdb_WritePreComp;	/* Starting cylinder of write precompensation */
+    uint32_t	rdb_ReducedWrite;	/* Starting cylinder of reduced write current */
+    uint32_t	rdb_StepRate;		/* Step rate of the drive */
+    uint32_t	rdb_Reserved3[5];	/* Unused word, need to be set to $ffffffff */
+    /* logical drive characteristics */
+    uint32_t	rdb_RDBBlocksLo;	/* low block of range reserved for hardblocks */
+    uint32_t	rdb_RDBBlocksHi;	/* high block of range for these hardblocks */
+    uint32_t	rdb_LoCylinder;		/* low cylinder of partitionable disk area */
+    uint32_t	rdb_HiCylinder;		/* high cylinder of partitionable data area */
+    uint32_t	rdb_CylBlocks;		/* number of blocks available per cylinder */
+    uint32_t	rdb_AutoParkSeconds;	/* zero for no auto park */
+    uint32_t	rdb_HighRDSKBlock;	/* highest block used by RDSK */
+					/* (not including replacement bad blocks) */
+    uint32_t	rdb_Reserved4;
+    /* drive identification */
+    char	rdb_DiskVendor[8];
+    char	rdb_DiskProduct[16];
+    char	rdb_DiskRevision[4];
+    char	rdb_ControllerVendor[8];
+    char	rdb_ControllerProduct[16];
+    char	rdb_ControllerRevision[4];
+    uint32_t	rdb_Reserved5[10];
+};
+
+#define	RDB_LOCATION_LIMIT	16
+#define RDSK(pos) ((struct RigidDiskBlock *)(pos)) 
+
+/* TODO : print drive ident strings */
+void _amiga_dump_rdb (struct RigidDiskBlock * rdb) {
+	TRACE();
+	DPRINT(DEBUG_BLOCK, "RigidDiskBlock\n\trgb_ID = %08x %s\n",
+		PED_BE32_TO_CPU(rdb->rdb_ID),
+		(PED_BE32_TO_CPU(rdb->rdb_ID)==IDNAME_RIGIDDISK ? "RDSK" : ""));
+	DPRINT(DEBUG_BLOCK, "\trdb_SummedLongs = %08x\n",
+		PED_BE32_TO_CPU(rdb->rdb_SummedLongs));
+	DPRINT(DEBUG_BLOCK, "\trdb_ChkSum = %08x (block checksum is %d)\n",
+		PED_BE32_TO_CPU(rdb->rdb_ChkSum), _amiga_checksum (AMIGA(rdb)));
+	DPRINT(DEBUG_BLOCK, "\trdb_HostID = %08x\n", PED_BE32_TO_CPU(rdb->rdb_HostID));
+	DPRINT(DEBUG_BLOCK, "\trdb_BlockBytes = %08x\n", PED_BE32_TO_CPU(rdb->rdb_BlockBytes));
+	DPRINT(DEBUG_BLOCK, "\trdb_Flags = %08x\n", PED_BE32_TO_CPU(rdb->rdb_Flags));
+	DPRINT(DEBUG_BLOCK, "\trdb_BadBlockList = %08x\n", PED_BE32_TO_CPU(rdb->rdb_BadBlockList));
+	DPRINT(DEBUG_BLOCK, "\trdb_PartitionList = %08x\n", PED_BE32_TO_CPU(rdb->rdb_PartitionList));
+	DPRINT(DEBUG_BLOCK, "\trdb_FileSysHeaderList = %08x\n", PED_BE32_TO_CPU(rdb->rdb_FileSysHeaderList));
+	DPRINT(DEBUG_BLOCK, "\trdb_DriveInit = %08x\n", PED_BE32_TO_CPU(rdb->rdb_DriveInit));
+	DPRINT(DEBUG_BLOCK, "\trdb_BootBlockList = %08x\n", PED_BE32_TO_CPU(rdb->rdb_BootBlockList));
+	DPRINT(DEBUG_BLOCK, "\trdb_Cylinders = %08x\n", PED_BE32_TO_CPU(rdb->rdb_Cylinders));
+	DPRINT(DEBUG_BLOCK, "\trdb_Sectors = %08x\n", PED_BE32_TO_CPU(rdb->rdb_Sectors));
+	DPRINT(DEBUG_BLOCK, "\trdb_Heads = %08x\n", PED_BE32_TO_CPU(rdb->rdb_Heads));
+	DPRINT(DEBUG_BLOCK, "\trdb_Interleave = %08x\n", PED_BE32_TO_CPU(rdb->rdb_Interleave));
+	DPRINT(DEBUG_BLOCK, "\trdb_Park = %08x\n", PED_BE32_TO_CPU(rdb->rdb_Park));
+	DPRINT(DEBUG_BLOCK, "\trdb_WritePreComp = %08x\n", PED_BE32_TO_CPU(rdb->rdb_WritePreComp));
+	DPRINT(DEBUG_BLOCK, "\trdb_ReducedWrite = %08x\n", PED_BE32_TO_CPU(rdb->rdb_ReducedWrite));
+	DPRINT(DEBUG_BLOCK, "\trdb_StepRate = %08x\n", PED_BE32_TO_CPU(rdb->rdb_StepRate));
+	DPRINT(DEBUG_BLOCK, "\trdb_RDBBlocksLo = %u\n", PED_BE32_TO_CPU(rdb->rdb_RDBBlocksLo));
+	DPRINT(DEBUG_BLOCK, "\trdb_RDBBlocksHi = %u\n", PED_BE32_TO_CPU(rdb->rdb_RDBBlocksHi));
+	DPRINT(DEBUG_BLOCK, "\trdb_LoCylinder = %u\n", PED_BE32_TO_CPU(rdb->rdb_LoCylinder));
+	DPRINT(DEBUG_BLOCK, "\trdb_HiCylinder = %u\n", PED_BE32_TO_CPU(rdb->rdb_HiCylinder));
+	DPRINT(DEBUG_BLOCK, "\trdb_CylBlocks = %u (Heads*Sectors = %u\n",
+		PED_BE32_TO_CPU(rdb->rdb_CylBlocks),
+		PED_BE32_TO_CPU(rdb->rdb_Sectors)*PED_BE32_TO_CPU(rdb->rdb_Heads));
+	DPRINT(DEBUG_BLOCK, "\trdb_AutoParkSeconds = %08x\n", PED_BE32_TO_CPU(rdb->rdb_AutoParkSeconds));
+	DPRINT(DEBUG_BLOCK, "\trdb_HighRDSKBlock = %08x\n", PED_BE32_TO_CPU(rdb->rdb_HighRDSKBlock));
+}
+
+#define AMIGA_RDB_NOT_FOUND ((uint32_t)0xffffffff)
+
+static uint32_t
+_amiga_find_rdb (PedDevice *dev, struct RigidDiskBlock *rdb) {
+	int i;
+	TRACE();
+
+	for (i = 0; i<RDB_LOCATION_LIMIT; i++) {
+		if (!_amiga_read_block (dev, AMIGA(rdb), i)) {
+			continue;
+		}
+		if (PED_BE32_TO_CPU (rdb->rdb_ID) == IDNAME_RIGIDDISK) {
+			return i;
+		}
+	}
+	return AMIGA_RDB_NOT_FOUND;
+}
+
+struct PartitionBlock {
+    uint32_t	pb_ID;			/* Identifier 32 bit word : 'PART' */
+    uint32_t	pb_SummedLongs;		/* Size of the structure for checksums */
+    int32_t	pb_ChkSum;		/* Checksum of the structure */
+    uint32_t	pb_HostID;		/* SCSI Target ID of host, not really used */
+    uint32_t	pb_Next;		/* Block number of the next PartitionBlock */
+    uint32_t	pb_Flags;		/* Part Flags (NOMOUNT and BOOTABLE) */
+    uint32_t	pb_Reserved1[2];
+    uint32_t	pb_DevFlags;		/* Preferred flags for OpenDevice */
+    uint8_t	pb_DriveName[32];	/* Preferred DOS device name: BSTR form */
+    uint32_t	pb_Reserved2[15];
+    uint32_t	de_TableSize;		/* Size of Environment vector */
+    uint32_t	de_SizeBlock;		/* Size of the blocks in 32 bit words, usually 128 */
+    uint32_t	de_SecOrg;	     	/* Not used; must be 0 */
+    uint32_t	de_Surfaces;		/* Number of heads (surfaces) */
+    uint32_t	de_SectorPerBlock;	/* Disk sectors per block, used with SizeBlock, usually 1 */
+    uint32_t	de_BlocksPerTrack;	/* Blocks per track. drive specific */
+    uint32_t	de_Reserved;		/* DOS reserved blocks at start of partition. */
+    uint32_t	de_PreAlloc;		/* DOS reserved blocks at end of partition */
+    uint32_t	de_Interleave;		/* Not used, usually 0 */
+    uint32_t	de_LowCyl;		/* First cylinder of the partition */
+    uint32_t	de_HighCyl;		/* Last cylinder of the partition */
+    uint32_t	de_NumBuffers;		/* Initial # DOS of buffers.  */
+    uint32_t	de_BufMemType;		/* Type of mem to allocate for buffers */
+    uint32_t	de_MaxTransfer;		/* Max number of bytes to transfer at a time */
+    uint32_t	de_Mask;		/* Address Mask to block out certain memory */
+    int32_t	de_BootPri;		/* Boot priority for autoboot */
+    uint32_t	de_DosType;		/* Dostype of the filesystem */
+    uint32_t	de_Baud;		/* Baud rate for serial handler */
+    uint32_t	de_Control;		/* Control word for handler/filesystem */
+    uint32_t	de_BootBlocks;		/* Number of blocks containing boot code */
+    uint32_t	pb_EReserved[12];
+};
+
+#define PART(pos) ((struct PartitionBlock *)(pos))
+
+#define	PBFB_BOOTABLE	0	/* this partition is intended to be bootable */
+#define	PBFF_BOOTABLE	1L	/*   (expected directories and files exist) */
+#define	PBFB_NOMOUNT	1	/* do not mount this partition (e.g. manually */
+#define	PBFF_NOMOUNT	2L	/*   mounted, but space reserved here) */
+
+void _amiga_dump_part (struct PartitionBlock * part) {
+	TRACE();
+	DPRINT(DEBUG_BLOCK, "Partition : cylinder %d to %d, blocksize : %d (in bytes)\n",
+		PED_BE32_TO_CPU(part->de_LowCyl),
+		PED_BE32_TO_CPU(part->de_HighCyl),
+		PED_BE32_TO_CPU(part->de_SizeBlock)*4*PED_BE32_TO_CPU(part->de_SectorPerBlock));
+	DPRINT(DEBUG_BLOCK, "\tdostype : %08x, reserved : %d, prealloc : %d\n",
+		PED_BE32_TO_CPU(part->de_DosType),
+		PED_BE32_TO_CPU(part->de_Reserved),
+		PED_BE32_TO_CPU(part->de_PreAlloc));
+	DPRINT(DEBUG_BLOCK, "PartitionBlock\n");
+	DPRINT(DEBUG_BLOCK, "\tpart_ID = %08x %s\n", PED_BE32_TO_CPU(part->pb_ID),
+		(PED_BE32_TO_CPU(part->pb_ID)==IDNAME_PARTITION ? "PART" : ""));
+	DPRINT(DEBUG_BLOCK, "\tpart_SummedLongs = %08x\n",
+		PED_BE32_TO_CPU(part->pb_SummedLongs));
+	DPRINT(DEBUG_BLOCK, "\tpart_ChkSum = %08x (block checksum is %d)\n",
+		PED_BE32_TO_CPU(part->pb_ChkSum), _amiga_checksum (AMIGA(part)));
+	DPRINT(DEBUG_BLOCK, "\tpart_HostID = %08x\n", PED_BE32_TO_CPU(part->pb_HostID));
+	DPRINT(DEBUG_BLOCK, "\tpart_Next = %08x (%d)\n",
+		PED_BE32_TO_CPU(part->pb_Next), PED_BE32_TO_CPU(part->pb_Next));
+	DPRINT(DEBUG_BLOCK, "\tpart_Flags = %08x\n", PED_BE32_TO_CPU(part->pb_Flags));
+	DPRINT(DEBUG_BLOCK, "\tpart_DevFlags = %08x\n", PED_BE32_TO_CPU(part->pb_DevFlags));
+	DPRINT(DEBUG_BLOCK, "\tpart_DriveName = %s\n", _amiga_get_bstr(part->pb_DriveName));
+	DPRINT(DEBUG_BLOCK, "\tde_TableSize = %08x\n", PED_BE32_TO_CPU(part->de_TableSize));
+	DPRINT(DEBUG_BLOCK, "\tde_SizeBlock = %08x\n", PED_BE32_TO_CPU(part->de_SizeBlock));
+	DPRINT(DEBUG_BLOCK, "\tde_SecOrg = %08x\n", PED_BE32_TO_CPU(part->de_SecOrg));
+	DPRINT(DEBUG_BLOCK, "\tde_Surfaces = %08x\n", PED_BE32_TO_CPU(part->de_Surfaces));
+	DPRINT(DEBUG_BLOCK, "\tde_SectorPerBlock = %08x\n", PED_BE32_TO_CPU(part->de_SectorPerBlock));
+	DPRINT(DEBUG_BLOCK, "\tde_BlocksPerTrack = %08x\n", PED_BE32_TO_CPU(part->de_BlocksPerTrack));
+	DPRINT(DEBUG_BLOCK, "\tde_Reserved = %08x\n", PED_BE32_TO_CPU(part->de_Reserved));
+	DPRINT(DEBUG_BLOCK, "\tde_PreAlloc = %08x\n", PED_BE32_TO_CPU(part->de_PreAlloc));
+	DPRINT(DEBUG_BLOCK, "\tde_Interleave = %08x\n", PED_BE32_TO_CPU(part->de_Interleave));
+	DPRINT(DEBUG_BLOCK, "\tde_LowCyl = %08x\n", PED_BE32_TO_CPU(part->de_LowCyl));
+	DPRINT(DEBUG_BLOCK, "\tde_HighCyl = %08x\n", PED_BE32_TO_CPU(part->de_HighCyl));
+	DPRINT(DEBUG_BLOCK, "\tde_NumBuffers = %08x\n", PED_BE32_TO_CPU(part->de_NumBuffers));
+	DPRINT(DEBUG_BLOCK, "\tde_BufMemType = %08x\n", PED_BE32_TO_CPU(part->de_BufMemType));
+	DPRINT(DEBUG_BLOCK, "\tde_MaxTransfer = %08x\n", PED_BE32_TO_CPU(part->de_MaxTransfer));
+	DPRINT(DEBUG_BLOCK, "\tde_Mask = %08x\n", PED_BE32_TO_CPU(part->de_Mask));
+	DPRINT(DEBUG_BLOCK, "\tde_BootPri = %08x\n", PED_BE32_TO_CPU(part->de_BootPri));
+	DPRINT(DEBUG_BLOCK, "\tde_DosType = %08x\n", PED_BE32_TO_CPU(part->de_DosType));
+	DPRINT(DEBUG_BLOCK, "\tde_Baud = %08x\n", PED_BE32_TO_CPU(part->de_Baud));
+	DPRINT(DEBUG_BLOCK, "\tde_Control = %08x\n", PED_BE32_TO_CPU(part->de_Control));
+	DPRINT(DEBUG_BLOCK, "\tde_BootBlocks = %08x\n", PED_BE32_TO_CPU(part->de_BootBlocks));
+}
+
+#define AMIGA_MAX_PARTITIONS 128
+
+struct LinkedBlock {
+    uint32_t	lk_ID;			/* Identifier 32 bit word */
+    uint32_t	lk_SummedLongs;		/* Size of the structure for checksums */
+    int32_t	lk_ChkSum;		/* Checksum of the structure */
+    uint32_t	pb_HostID;		/* SCSI Target ID of host, not really used */
+    uint32_t	lk_Next;		/* Block number of the next PartitionBlock */
+};
+struct Linked2Block {
+    uint32_t	lk2_ID;			/* Identifier 32 bit word */
+    uint32_t	lk2_SummedLongs;		/* Size of the structure for checksums */
+    int32_t	lk2_ChkSum;		/* Checksum of the structure */
+    uint32_t	lk2_Next;		/* Block number of the next PartitionBlock */
+    uint32_t	lk2_Reverved[13];
+    uint32_t	lk2_Linked;		/* Secondary linked list */
+};
+#define LINK_END	0xffffffff
+#define LNK(pos)	((struct LinkedBlock *)(pos))
+#define LNK2(pos)	((struct Linked2Block *)(pos))
+
+void _amiga_dump_linked (struct LinkedBlock * block) {
+	TRACE();
+	DPRINT(DEBUG_BLOCK, "LinkedBlock\n\tpart_ID = %08x %s\n",
+		PED_BE32_TO_CPU(block->lk_ID),
+		_amiga_block_id(PED_BE32_TO_CPU(block->lk_ID)));
+	DPRINT(DEBUG_BLOCK, "\tlk_SummedLongs = %08x\n",
+			PED_BE32_TO_CPU(block->lk_SummedLongs));
+	DPRINT(DEBUG_BLOCK, "\tlk_ChkSum = %08x (block checksum is %d)\n",
+		block->lk_ChkSum, _amiga_checksum (AMIGA(block)));
+	DPRINT(DEBUG_BLOCK, "\tlk_Next = %08x (%d)\n",
+		PED_BE32_TO_CPU(block->lk_Next), PED_BE32_TO_CPU(block->lk_Next));
+	if (PED_BE32_TO_CPU(block->lk_ID)==IDNAME_FILESYSHEADER) {
+		DPRINT(DEBUG_BLOCK, "\tlk2_Linked = %08x (%d)\n", 
+			PED_BE32_TO_CPU(LNK2(block)->lk2_Linked),
+			PED_BE32_TO_CPU(LNK2(block)->lk2_Linked));
+	}
+}
+
+#define MAX_RDB_BLOCK (RDB_LOCATION_LIMIT + 2 * AMIGA_MAX_PARTITIONS + 2)
+
+static PedDiskType amiga_disk_type;
+
+static int
+amiga_probe (PedDevice *dev)
+{
+	struct RigidDiskBlock *rdb;
+	uint32_t found;
+	TRACE();
+	PED_ASSERT(dev!= NULL, return 0);
+
+	if ((rdb=RDSK(ped_malloc(PED_SECTOR_SIZE)))==NULL) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate rdb block\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return 0;
+		}
+	}
+	found = _amiga_find_rdb (dev, rdb);
+	ped_free (rdb);
+
+	return (found == AMIGA_RDB_NOT_FOUND ? 0 : 1);
+}
+		
+static PedDisk*
+amiga_alloc (PedDevice* dev)
+{
+	PedDisk *disk;
+	struct AmigaDisk *adsk;
+	struct RigidDiskBlock *rdb;
+	int highest_cylinder, highest_block;
+	TRACE();
+	PED_ASSERT(dev!= NULL, return NULL);
+
+	if (!(disk = _ped_disk_alloc (dev, &amiga_disk_type))) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate disk structure\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return NULL;
+		}
+	}
+
+	if (!(disk->disk_specific = ped_malloc (PED_SECTOR_SIZE))) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate disk_specific rdb block\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				ped_free (disk);
+				return NULL;
+		}
+	}
+	rdb = disk->disk_specific;
+
+	memset(rdb, -1, sizeof(struct RigidDiskBlock));
+
+	rdb->rdb_ID = PED_CPU_TO_BE32 (IDNAME_RIGIDDISK);
+	rdb->rdb_SummedLongs = PED_CPU_TO_BE32 (64);
+	rdb->rdb_HostID = PED_CPU_TO_BE32 (0);
+	rdb->rdb_BlockBytes = PED_CPU_TO_BE32 (PED_SECTOR_SIZE);
+	rdb->rdb_Flags = PED_CPU_TO_BE32 (0);
+
+	/* Block lists */
+	rdb->rdb_BadBlockList = PED_CPU_TO_BE32 (0xffffffff);
+	rdb->rdb_PartitionList = PED_CPU_TO_BE32 (0xffffffff);
+	rdb->rdb_FileSysHeaderList = PED_CPU_TO_BE32 (0xffffffff);
+	rdb->rdb_DriveInit = PED_CPU_TO_BE32 (0xffffffff);
+	
+	/* Physical drive characteristics */
+	rdb->rdb_Cylinders = PED_CPU_TO_BE32 (dev->cylinders);
+	rdb->rdb_Sectors = PED_CPU_TO_BE32 (dev->sectors);
+	rdb->rdb_Heads = PED_CPU_TO_BE32 (dev->heads);
+	rdb->rdb_Interleave = PED_CPU_TO_BE32 (0);
+	rdb->rdb_Park = PED_CPU_TO_BE32 (dev->cylinders);
+	rdb->rdb_WritePreComp = PED_CPU_TO_BE32 (dev->cylinders);
+	rdb->rdb_ReducedWrite = PED_CPU_TO_BE32 (dev->cylinders);
+	rdb->rdb_StepRate = PED_CPU_TO_BE32 (0);
+
+	highest_cylinder = MAX_RDB_BLOCK / (dev->sectors * dev->heads) + 1;
+	highest_block = highest_cylinder * dev->sectors * dev->heads - 1;
+
+	/* Logical driver characteristics */
+	rdb->rdb_RDBBlocksLo = PED_CPU_TO_BE32 (0);
+	rdb->rdb_RDBBlocksHi = PED_CPU_TO_BE32 (highest_block);
+	rdb->rdb_LoCylinder = PED_CPU_TO_BE32 (highest_cylinder);
+	rdb->rdb_HiCylinder = PED_CPU_TO_BE32 (dev->cylinders -1);
+	rdb->rdb_CylBlocks = PED_CPU_TO_BE32 (dev->sectors * dev->heads);
+	rdb->rdb_AutoParkSeconds = PED_CPU_TO_BE32 (0);
+	/* rdb_HighRDSKBlock will only be set when writing */
+	rdb->rdb_HighRDSKBlock = PED_CPU_TO_BE32 (0);
+
+	/* Driver identification */
+	_amiga_set_bstr("", rdb->rdb_DiskVendor, 8);
+	_amiga_set_bstr(dev->model, rdb->rdb_DiskProduct, 16);
+	_amiga_set_bstr("", rdb->rdb_DiskRevision, 4);
+	_amiga_set_bstr("", rdb->rdb_ControllerVendor, 8);
+	_amiga_set_bstr("", rdb->rdb_ControllerProduct, 16);
+	_amiga_set_bstr("", rdb->rdb_ControllerRevision, 4);
+
+	/* And calculate the checksum */
+	_amiga_calculate_checksum ((struct AmigaBlock *) rdb);
+	
+	return disk;
+}
+
+static PedDisk*
+amiga_duplicate (const PedDisk* disk)
+{
+	PedDisk*	new_disk;
+	struct RigidDiskBlock *	new_rdb;
+	struct RigidDiskBlock * old_rdb;
+	TRACE();
+	PED_ASSERT(disk!= NULL, return NULL);
+	PED_ASSERT(disk->dev!= NULL, return NULL);
+	PED_ASSERT(disk->disk_specific!= NULL, return NULL);
+
+	old_rdb = (struct RigidDiskBlock *) disk->disk_specific;
+       
+	if (!(new_disk = ped_disk_new_fresh (disk->dev, &amiga_disk_type))) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate a new disk structure\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return NULL;
+		}
+	}
+
+	new_rdb = (struct RigidDiskBlock *) new_disk->disk_specific;
+	memcpy (new_rdb, old_rdb, 256);
+	return new_disk;
+}
+
+static void
+amiga_free (PedDisk* disk)
+{
+	TRACE();
+	PED_ASSERT(disk!= NULL, return);
+	PED_ASSERT(disk->disk_specific!= NULL, return);
+
+	ped_free (disk->disk_specific);
+	_ped_disk_free (disk);
+}
+
+#ifndef DISCOVER_ONLY
+static int
+amiga_clobber (PedDevice* dev)
+{
+	struct RigidDiskBlock *rdb;
+	uint32_t i;
+	int result = 0;
+	TRACE();
+	PED_ASSERT(dev!= NULL, return 0);
+
+	if ((rdb=RDSK(ped_malloc(PED_SECTOR_SIZE)))==NULL) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate rdb block\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return 0;
+		}
+	}
+
+	while ((i = _amiga_find_rdb (dev, rdb)) != AMIGA_RDB_NOT_FOUND) {
+		rdb->rdb_ID = PED_CPU_TO_BE32 (0);
+		result = ped_device_write (dev, (void*) rdb, i, 1);
+	}
+
+	ped_free (rdb);
+
+	return result;
+}
+#endif /* !DISCOVER_ONLY */
+
+static int
+_amiga_loop_check (uint32_t block, uint32_t * blocklist, uint32_t max)
+{
+	uint32_t i;
+	TRACE();
+
+	for (i = 0; i < max; i++)
+		if (block == blocklist[i]) {
+			/* We are looping, let's stop.  */
+			return 1;
+		}
+	blocklist[max] = block;
+	return 0;
+}
+
+/* We have already allocated a rdb, we are now reading it from the disk */
+static int
+amiga_read (PedDisk* disk)
+{
+	struct RigidDiskBlock *rdb;
+	struct PartitionBlock *partition;
+	uint32_t partblock;
+	uint32_t partlist[AMIGA_MAX_PARTITIONS];
+	PedSector cylblocks;
+	int i;
+	TRACE();
+	PED_ASSERT(disk!= NULL, return 0);
+	PED_ASSERT(disk->dev!= NULL, return 0);
+	PED_ASSERT(disk->disk_specific!= NULL, return 0);
+	rdb = RDSK(disk->disk_specific);
+
+	if (_amiga_find_rdb (disk->dev, rdb) == AMIGA_RDB_NOT_FOUND) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Didn't find rdb block, should never happen\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return 0;
+		}
+	}
+#if (DEBUG_BLOCKS & MASTER_DEBUG)
+		_amiga_dump_rdb(rdb);
+#endif
+
+	/* Let's copy the rdb read geometry to the dev */
+	disk->dev->cylinders = PED_BE32_TO_CPU (rdb->rdb_Cylinders);
+	disk->dev->heads = PED_BE32_TO_CPU (rdb->rdb_Heads);
+	disk->dev->sectors = PED_BE32_TO_CPU (rdb->rdb_Sectors);
+	cylblocks = (PedSector) PED_BE32_TO_CPU (rdb->rdb_Heads) *
+		(PedSector) PED_BE32_TO_CPU (rdb->rdb_Sectors);
+
+	/* Remove all partitions in the former in memory table */
+	ped_disk_delete_all (disk);
+
+	/* Let's allocate a partition block */
+	if (!(partition = ped_malloc (PED_SECTOR_SIZE))) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate partition block\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return 0;
+		}
+	}
+
+	/* We initialize the hardblock free list to detect loops */
+	for (i = 0; i < AMIGA_MAX_PARTITIONS; i++) partlist[i] = 0xffffffff;
+
+	for (i = 1, partblock = PED_BE32_TO_CPU(rdb->rdb_PartitionList);
+		i < AMIGA_MAX_PARTITIONS && partblock != 0xffffffff;
+		i++, partblock = PED_BE32_TO_CPU(partition->pb_Next))
+	{
+		PedPartition *part;
+		PedSector start, end;
+		struct DosEnvec *de;
+		PedConstraint *constraint_exact;
+		int j; 
+
+		/* Let's look for loops in the partition table */
+		if (_amiga_loop_check(partblock, partlist, i)) {
+			break;
+		}
+
+		/* Let's allocate and read a partition block to get its geometry*/
+		if (!_amiga_read_block (disk->dev, AMIGA(partition), (PedSector)partblock)) {
+			ped_free(partition);
+			return 0;
+		}
+#if (DEBUG_BLOCK & MASTER_DEBUG)
+		_amiga_dump_part(partition);
+#endif
+
+		start = ((PedSector) PED_BE32_TO_CPU (partition->de_LowCyl)) * cylblocks;
+		end = ((((PedSector) PED_BE32_TO_CPU (partition->de_HighCyl))+1) * (cylblocks))-1;
+
+		/* We can now construct a new partition */
+		if (!(part = ped_partition_new (disk, 0, NULL, start, end))) {
+			switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+				PED_EXCEPTION_CANCEL,
+				_("%s : Failed to allocate new partition (%llu -> %llu)\n"),
+				__func__, start, end))
+			{
+				case PED_EXCEPTION_CANCEL :
+				case PED_EXCEPTION_UNHANDLED :
+				default : 
+					ped_free(partition);
+					return 0;
+			}
+		}
+		/* And copy over the partition block */
+		memcpy(part->disk_specific, partition, 256);
+
+		part->num = i;
+		part->type = 0;
+		/* Let's probe what filesystem is present on the disk */
+		part->fs_type = ped_file_system_probe (&part->geom);
+		
+		constraint_exact = ped_constraint_exact (&part->geom);
+		if (!ped_disk_add_partition (disk, part, constraint_exact)) {
+			switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+				PED_EXCEPTION_CANCEL,
+				_("%s : Failed to add new partition\n"), __func__))
+			{
+				case PED_EXCEPTION_CANCEL :
+				case PED_EXCEPTION_UNHANDLED :
+				default : 
+					ped_free(partition);
+					return 0;
+			}
+		}
+		ped_constraint_destroy (constraint_exact);
+	}
+	return 1;
+}
+
+static int
+_amiga_find_free_blocks(PedDisk *disk, uint32_t *table,
+	struct LinkedBlock *block, uint32_t first, uint32_t type)
+{
+	PedSector next;
+	TRACE();
+	PED_ASSERT(disk!= NULL, return 0);
+	PED_ASSERT(disk->dev!= NULL, return 0);
+
+	for (next = first; next != LINK_END; next = PED_BE32_TO_CPU(block->lk_Next)) {
+		if (table[next] != IDNAME_FREE) {
+			switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+				PED_EXCEPTION_FIX | PED_EXCEPTION_IGNORE | PED_EXCEPTION_CANCEL,
+				_("%s : Loop detected at block %d\n"), __func__, next))
+			{
+				case PED_EXCEPTION_CANCEL :
+					return 0;
+				case PED_EXCEPTION_FIX :
+					/* Need to add fixing code */
+				case PED_EXCEPTION_IGNORE :
+				case PED_EXCEPTION_UNHANDLED :
+				default : 
+					return 1;
+			}
+		}
+
+		if (!_amiga_read_block (disk->dev, AMIGA(block), next)) {
+			return 0;
+		}
+#if (DEBUG_BLOCK & MASTER_DEBUG)
+		_amiga_dump_linked(block);
+#endif
+		if (PED_BE32_TO_CPU(block->lk_ID) != type) {
+			switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+				PED_EXCEPTION_CANCEL,
+				_("%s : The %s list seems bad at block %s\n"),
+				__func__, _amiga_block_id(PED_BE32_TO_CPU(block->lk_ID)), next))
+			{
+				case PED_EXCEPTION_CANCEL :
+				case PED_EXCEPTION_UNHANDLED :
+				default : 
+					return 0;
+			}
+		}
+		table[next] = type;
+		if (PED_BE32_TO_CPU(block->lk_ID) == IDNAME_FILESYSHEADER) {
+			if (_amiga_find_free_blocks(disk, table, block,
+				PED_BE32_TO_CPU(LNK2(block)->lk2_Linked),
+				IDNAME_LOADSEG) == 0) return 0;
+		}
+	}
+	return 1;
+}
+static uint32_t
+_amiga_next_free_block(uint32_t *table, uint32_t start, uint32_t type) {
+	int i;
+	TRACE();
+
+	for (i = start; table[i] != type && table[i] != IDNAME_FREE; i++);
+	return i;
+}
+static PedPartition *
+_amiga_next_real_partition(PedDisk *disk, PedPartition *part) {
+	PedPartition *next;
+	TRACE();
+
+	for (next = ped_disk_next_partition (disk, part);
+		next != NULL && !ped_partition_is_active (next);
+		next = ped_disk_next_partition (disk, next));
+	return next;
+}
+#ifndef DISCOVER_ONLY
+static int
+amiga_write (PedDisk* disk)
+{
+	struct RigidDiskBlock *rdb;
+	struct LinkedBlock *block;
+	struct PartitionBlock *partition;
+	PedPartition *part, *next_part;
+	PedSector cylblocks, first_hb, last_hb, last_used_hb;
+	uint32_t * table;
+	uint32_t i, rdb_block, max_part;
+	uint32_t rdb_num, part_num, block_num, next_num;
+	TRACE();
+
+	PED_ASSERT (disk != NULL, return 0;);
+	PED_ASSERT (disk->dev != NULL, return 0;);
+	PED_ASSERT (disk->disk_specific != NULL, return 0;);
+
+	if (!(rdb = ped_malloc (PED_SECTOR_SIZE))) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate rdb block\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return 0;
+		}
+	}
+	/* Let's read the rdb */
+	if ((rdb_num = _amiga_find_rdb (disk->dev, rdb)) == AMIGA_RDB_NOT_FOUND) {
+		rdb_num = 2;
+	} else {
+		memcpy (RDSK(disk->disk_specific), rdb, PED_SECTOR_SIZE);
+	}
+	ped_free (rdb);
+	rdb = RDSK(disk->disk_specific);
+#if (DEBUG_BLOCK & MASTER_DEBUG)
+		_amiga_dump_rdb(rdb);
+#endif
+
+	/* Let's copy the rdb read geometry to the dev */
+	disk->dev->cylinders = PED_BE32_TO_CPU (rdb->rdb_Cylinders);
+	disk->dev->heads = PED_BE32_TO_CPU (rdb->rdb_Heads);
+	disk->dev->sectors = PED_BE32_TO_CPU (rdb->rdb_Sectors);
+	cylblocks = (PedSector) PED_BE32_TO_CPU (rdb->rdb_Heads) *
+		(PedSector) PED_BE32_TO_CPU (rdb->rdb_Sectors);
+	first_hb = (PedSector) PED_BE32_TO_CPU (rdb->rdb_RDBBlocksLo);
+	last_hb = (PedSector) PED_BE32_TO_CPU (rdb->rdb_RDBBlocksHi);
+	last_used_hb = (PedSector) PED_BE32_TO_CPU (rdb->rdb_HighRDSKBlock);
+
+	/* let's allocate a free block table and initialize it */
+	if (!(table = ped_malloc ((last_hb - first_hb + 1) * sizeof(uint32_t)))) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate free block table\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return 0;
+		}
+	}
+	memset(table, 0xff, (last_hb - first_hb + 1) * sizeof(uint32_t));
+	for (i = 0; i<=rdb_num; i++) table[i] = IDNAME_RIGIDDISK;
+	
+	/* Let's allocate a partition block */
+	if (!(block = ped_malloc (PED_SECTOR_SIZE))) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate partition block\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				ped_free (table);
+				return 0;
+		}
+	}
+
+	/* And fill the free block table */
+	if (_amiga_find_free_blocks(disk, table, block,
+		PED_BE32_TO_CPU (rdb->rdb_BadBlockList), IDNAME_BADBLOCK) == 0)
+	{
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to list badblocks\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				ped_free (table);
+				ped_free (block);
+				return 0;
+		}
+	}
+	if (_amiga_find_free_blocks(disk, table, block,
+		PED_BE32_TO_CPU (rdb->rdb_PartitionList), IDNAME_PARTITION) == 0)
+	{
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to list partitionblocks\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				ped_free (table);
+				ped_free (block);
+				return 0;
+		}
+	}
+	if (_amiga_find_free_blocks(disk, table, block,
+		PED_BE32_TO_CPU (rdb->rdb_FileSysHeaderList), IDNAME_FILESYSHEADER) == 0)
+	{
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to list filesystemblocks\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				ped_free (table);
+				ped_free (block);
+				return 0;
+		}
+	}
+	if (_amiga_find_free_blocks(disk, table, block,
+		PED_BE32_TO_CPU (rdb->rdb_BootBlockList), IDNAME_BOOT) == 0)
+	{
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to list bootblocks\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				ped_free (table);
+				ped_free (block);
+				return 0;
+		}
+	}
+
+	block_num = next_num = part_num = _amiga_next_free_block(table, rdb_num+1, IDNAME_PARTITION);
+	part = _amiga_next_real_partition(disk, NULL);
+	if (part == NULL) {
+		rdb->rdb_PartitionList = PED_CPU_TO_BE32(LINK_END);
+	} else {
+		rdb->rdb_PartitionList = PED_CPU_TO_BE32(part_num);
+		while (part != NULL) {
+			PED_ASSERT(part->disk_specific!=NULL, return 0);
+			next_part = _amiga_next_real_partition(disk, part);
+			block_num = next_num;
+			next_num = _amiga_next_free_block(table, block_num+1, IDNAME_PARTITION);
+			partition = PART(part->disk_specific);
+			partition->pb_Next = next_part==NULL ? PED_CPU_TO_BE32(LINK_END):PED_CPU_TO_BE32(next_num);
+			partition->de_LowCyl = PED_CPU_TO_BE32(part->geom.start/cylblocks);
+			partition->de_HighCyl = PED_CPU_TO_BE32((part->geom.end+1)/cylblocks-1);
+			_amiga_calculate_checksum(AMIGA(partition));
+			if (!ped_device_write (disk->dev, (void*) partition, block_num, 1)) {
+				switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+					PED_EXCEPTION_CANCEL,
+					_("%s : Failed to write partition block at\n"), __func__, block_num))
+				{
+					case PED_EXCEPTION_CANCEL :
+					case PED_EXCEPTION_UNHANDLED :
+					default : 
+						ped_free (table);
+						ped_free (block);
+						/* WARNING : If we fail here, we stop everything,
+						 * and the partition table is lost. A Better
+						 * solution should be found, using the second
+						 * half of the hardblocks to not overwrite the
+						 * old partition table. It becomes problematic
+						 * if we use more than half of the hardblocks. */
+						return 0;
+				}
+			}
+			part = next_part;
+		}
+	}
+	if (block_num >PED_BE32_TO_CPU (rdb->rdb_HighRDSKBlock)) {
+		rdb->rdb_HighRDSKBlock = PED_CPU_TO_BE32(block_num);
+	}
+	_amiga_calculate_checksum(AMIGA(rdb));
+	if (!ped_device_write (disk->dev, (void*) disk->disk_specific, rdb_num, 1)) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to write rdb block at\n"), __func__, rdb_num))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				ped_free (table);
+				ped_free (block);
+				return 0;
+		}
+	}
+			
+#if (DEBUG_BLOCK & MASTER_DEBUG)
+		_amiga_dump_rdb(rdb);
+#endif
+	ped_free (table);
+	ped_free (block);
+	return ped_device_sync (disk->dev);
+}
+#endif /* !DISCOVER_ONLY */
+
+static PedPartition*
+amiga_partition_new (const PedDisk* disk, PedPartitionType part_type,
+		   const PedFileSystemType* fs_type,
+		   PedSector start, PedSector end)
+{
+	PedPartition *part;
+	PedDevice *dev;
+	PedSector cyl;
+	struct PartitionBlock *partition;
+	struct RigidDiskBlock *rdb;
+	TRACE();
+	PED_ASSERT(disk!= NULL, return NULL);
+	PED_ASSERT(disk->dev!= NULL, return NULL);
+	PED_ASSERT(disk->disk_specific!= NULL, return NULL);
+	dev = disk->dev;
+	cyl = (PedSector) (dev->sectors * dev->heads);
+	rdb = RDSK(disk->disk_specific);
+
+	if (!(part = _ped_partition_alloc (disk, part_type, fs_type, start, end))) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate a partition structure (%llu, %llu)"),
+			__func__, start, end))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return NULL;
+		}
+	}
+	
+
+	if (ped_partition_is_active (part)) {
+		if (!(part->disk_specific = ped_malloc (PED_SECTOR_SIZE))) {
+			switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+				PED_EXCEPTION_CANCEL,
+				_("%s : Failed to allocate a partition disk_specific block\n"), __func__))
+			{
+				case PED_EXCEPTION_CANCEL :
+				case PED_EXCEPTION_UNHANDLED :
+				default : 
+					ped_free (part);
+					return NULL;
+			}
+		}
+		partition = PART(part->disk_specific);
+		memset(partition, -1, sizeof(struct PartitionBlock));
+
+		partition->pb_ID = PED_CPU_TO_BE32(IDNAME_PARTITION);
+		partition->pb_SummedLongs = PED_CPU_TO_BE32(64);
+		partition->pb_HostID = rdb->rdb_HostID;
+		partition->pb_Flags = PED_CPU_TO_BE32(0);
+		/* TODO : use a scheme including the device name and the
+		 * partition number, if it is possible */
+		_amiga_set_bstr("dhx", partition->pb_DriveName, 32);
+
+		partition->de_TableSize = PED_CPU_TO_BE32(19);
+		partition->de_SizeBlock = PED_CPU_TO_BE32(128);
+		partition->de_SecOrg = PED_CPU_TO_BE32(0);
+		partition->de_Surfaces = PED_CPU_TO_BE32(dev->heads);
+		partition->de_SectorPerBlock = PED_CPU_TO_BE32(1);
+		partition->de_BlocksPerTrack = PED_CPU_TO_BE32(dev->sectors);
+		partition->de_Reserved = PED_CPU_TO_BE32(2);
+		partition->de_PreAlloc = PED_CPU_TO_BE32(0);
+		partition->de_Interleave = PED_CPU_TO_BE32(0);
+		partition->de_LowCyl = PED_CPU_TO_BE32(start/cyl);
+		partition->de_HighCyl = PED_CPU_TO_BE32((end+1)/cyl-1);
+		partition->de_NumBuffers = PED_CPU_TO_BE32(30);
+		partition->de_BufMemType = PED_CPU_TO_BE32(0);
+		partition->de_MaxTransfer = PED_CPU_TO_BE32(0x7fffffff);
+		partition->de_Mask = PED_CPU_TO_BE32(0xffffffff);
+		partition->de_BootPri = PED_CPU_TO_BE32(0);
+		partition->de_DosType = PED_CPU_TO_BE32(0x4c4e5800);
+		partition->de_Baud = PED_CPU_TO_BE32(0);
+		partition->de_Control = PED_CPU_TO_BE32(0);
+		partition->de_BootBlocks = PED_CPU_TO_BE32(0);
+
+#if (DEBUG_BLOCK & MASTER_DEBUG)
+		_amiga_dump_part(partition);
+#endif
+	} else {
+		part->disk_specific = NULL;
+	}
+	return part;
+}
+
+static PedPartition*
+amiga_partition_duplicate (const PedPartition* part)
+{
+	PedPartition *new_part;
+	struct PartitionBlock *new_amiga_part;
+	struct PartitionBlock *old_amiga_part;
+	TRACE();
+	PED_ASSERT(part!= NULL, return NULL);
+	PED_ASSERT(part->disk!= NULL, return NULL);
+	PED_ASSERT(part->disk_specific!= NULL, return NULL);
+	old_amiga_part = (struct PartitionBlock *) part->disk_specific;
+
+	new_part = ped_partition_new (part->disk, part->type,
+				      part->fs_type, part->geom.start,
+				      part->geom.end);
+	if (!new_part) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate a new partition structure\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return NULL;
+		}
+	}
+
+	new_amiga_part = (struct PartitionBlock *) new_part->disk_specific;
+	memcpy (new_amiga_part, old_amiga_part, 256);
+
+	return new_part;
+}
+
+static void
+amiga_partition_destroy (PedPartition* part)
+{
+	TRACE();
+	PED_ASSERT (part != NULL, return);
+
+	if (ped_partition_is_active (part)) {
+		PED_ASSERT (part->disk_specific!= NULL, return);
+		ped_free (part->disk_specific);
+	}
+	_ped_partition_free (part);
+}
+
+static int
+amiga_partition_set_system (PedPartition* part, const PedFileSystemType* fs_type)
+{
+	struct PartitionBlock *partition;
+	TRACE();
+
+	PED_ASSERT (part != NULL, return 0);
+	PED_ASSERT (part->disk_specific != NULL, return 0);
+	partition = PART(part->disk_specific);
+
+	part->fs_type = fs_type;
+
+	if (!fs_type)
+		partition->de_DosType = PED_CPU_TO_BE32(0x4c4e5800); /* 'LNX\0' */
+	else if (!strcmp (fs_type->name, "ext2"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x4c4e5800); /* 'LNX\0' */
+	else if (!strcmp (fs_type->name, "ext3"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x45585403); /* 'EXT\3' */
+	else if (!strcmp (fs_type->name, "linux-swap"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x53575000); /* 'SWP\0' */
+	else if (!strcmp (fs_type->name, "fat16"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x46415400); /* 'FAT\0' */
+	else if (!strcmp (fs_type->name, "fat32"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x46415401); /* 'FAT\1'*/
+	else if (!strcmp (fs_type->name, "hfs"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x48465300); /* 'HFS\0' */
+	else if (!strcmp (fs_type->name, "jfs"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x4a465300); /* 'JFS\0' */
+	else if (!strcmp (fs_type->name, "ntfs"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x4e544653); /* 'NTFS' */
+	else if (!strcmp (fs_type->name, "reiserfs"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x52465300); /* 'RFS\0' */
+	else if (!strcmp (fs_type->name, "sun-ufs"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x53554653); /* 'SUFS' */
+	else if (!strcmp (fs_type->name, "hp-ufs"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x48554653); /* 'HUFS' */
+	else if (!strcmp (fs_type->name, "xfs"))
+		partition->de_DosType = PED_CPU_TO_BE32(0x58465300); /* 'XFS\0' */
+	else
+		partition->de_DosType = PED_CPU_TO_BE32(0x00000000); /* unknown */
+	return 1;
+}
+
+static int
+amiga_partition_set_flag (PedPartition* part, PedPartitionFlag flag, int state)
+{
+	struct PartitionBlock *partition;
+	TRACE();
+
+	PED_ASSERT (part != NULL, return 0);
+	PED_ASSERT (part->disk_specific != NULL, return 0);
+
+	partition = PART(part->disk_specific);
+
+	switch (flag) {
+		case PED_PARTITION_BOOT:
+			if (state) partition->pb_Flags |= PED_CPU_TO_BE32(PBFF_BOOTABLE);
+			else partition->pb_Flags &= ~(PED_CPU_TO_BE32(PBFF_BOOTABLE));
+			return 1;
+		case PED_PARTITION_HIDDEN:
+			if (state) partition->pb_Flags |= PED_CPU_TO_BE32(PBFF_NOMOUNT);
+			else partition->pb_Flags &= ~(PED_CPU_TO_BE32(PBFF_NOMOUNT));
+			return 1;
+		default:
+			return 0;
+	}
+}
+
+static int
+amiga_partition_get_flag (const PedPartition* part, PedPartitionFlag flag)
+{
+	struct PartitionBlock *partition;
+	TRACE();
+
+	PED_ASSERT (part != NULL, return 0);
+	PED_ASSERT (part->disk_specific != NULL, return 0);
+
+	partition = PART(part->disk_specific);
+
+	switch (flag) {
+		case PED_PARTITION_BOOT:
+			return (partition->pb_Flags & PED_CPU_TO_BE32(PBFF_BOOTABLE));
+		case PED_PARTITION_HIDDEN:
+			return (partition->pb_Flags & PED_CPU_TO_BE32(PBFF_NOMOUNT));
+		default:
+			return 0;
+	}
+}
+
+static int
+amiga_partition_is_flag_available (const PedPartition* part,
+				 PedPartitionFlag flag)
+{
+	TRACE();
+	switch (flag) {
+	case PED_PARTITION_BOOT:
+	case PED_PARTITION_HIDDEN:
+		return 1;
+	default:
+		return 0;
+	}
+}
+
+static void             
+amiga_partition_set_name (PedPartition* part, const char* name)
+{               
+	struct PartitionBlock *partition;
+	TRACE();
+
+	PED_ASSERT (part != NULL, return);
+	PED_ASSERT (part->disk_specific != NULL, return);
+
+	partition = PART(part->disk_specific);
+	_amiga_set_bstr(name, partition->pb_DriveName, 32);
+}
+static const char*
+amiga_partition_get_name (const PedPartition* part)
+{
+	struct PartitionBlock *partition;
+	TRACE();
+
+	PED_ASSERT (part != NULL, return 0);
+	PED_ASSERT (part->disk_specific != NULL, return 0);
+
+	partition = PART(part->disk_specific);
+
+	return _amiga_get_bstr(partition->pb_DriveName);
+}
+
+static PedConstraint*
+_amiga_get_constraint (const PedDisk *disk)
+{
+	PedDevice *dev = disk->dev;
+	PedAlignment start_align, end_align;
+	PedGeometry max_geom;
+	struct RigidDiskBlock *rdb = RDSK(disk->disk_specific);
+	PedSector cyl = (PedSector) PED_BE32_TO_CPU(rdb->rdb_Sectors) *
+		PED_BE32_TO_CPU(rdb->rdb_Heads);
+	PedSector start = ((273 / cyl) + 1) * cyl;
+	PedSector length = dev->length - start;
+	PedSector max_part = (length / cyl) * cyl;
+	TRACE();
+
+	if (!ped_alignment_init(&start_align, 0, cyl)) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to initialize the start constraint\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return NULL;
+		}
+	}
+	if (!ped_alignment_init(&end_align, -1, cyl)) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to initialize the end constraint\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return NULL;
+		}
+	}
+	if (!ped_geometry_init(&max_geom, dev, start, length)) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to initialize the max constraint\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return NULL;
+		}
+	}
+
+	return ped_constraint_new (&start_align, &end_align,
+		&max_geom, &max_geom, cyl, max_part);
+}
+
+static void
+_amiga_dump_constraint (const PedConstraint* constraint)
+{
+	DPRINT (DEBUG_CONST, "Align Start : offset = %lld, grain = %lld\n",
+		constraint->start_align->offset,
+		constraint->start_align->grain_size);
+	DPRINT (DEBUG_CONST, "Align End : offset = %lld, grain = %lld\n",
+		constraint->end_align->offset,
+		constraint->end_align->grain_size);
+	DPRINT (DEBUG_CONST, "Range Start : start = %lld, length = %lld, end = %lld\n",
+		constraint->start_range->start,
+		constraint->start_range->length,
+		constraint->start_range->end);
+	DPRINT (DEBUG_CONST, "Range End : start = %lld, length = %lld, end = %lld\n",
+		constraint->end_range->start,
+		constraint->end_range->length,
+		constraint->end_range->end);
+	DPRINT (DEBUG_CONST, "Size : min = %lld, Max = %lld\n",
+		constraint->min_size, constraint->max_size);
+}
+
+static int
+amiga_partition_align (PedPartition* part, const PedConstraint* constraint)
+{
+	TRACE();
+
+	PED_ASSERT (part != NULL, return 0);
+	PED_ASSERT (part->disk != NULL, return 0);
+	
+#if (DEBUG_CONST & MASTER_DEBUG)
+	_amiga_dump_constraint (constraint);
+	_amiga_dump_constraint (_amiga_get_constraint (part->disk));
+#endif
+	if (_ped_partition_attempt_align (part, constraint,
+					  _amiga_get_constraint (part->disk)))
+	{
+	       	return 1;
+	}
+
+#ifndef DISCOVER_ONLY
+	ped_exception_throw (
+		PED_EXCEPTION_ERROR,
+		PED_EXCEPTION_CANCEL,
+		_("%s : Unable to satisfy all constraints on the partition."), __func__);
+#endif
+	return 0;
+}
+
+static int
+amiga_partition_enumerate (PedPartition* part)
+{
+	
+	int i;
+	PedPartition* p;
+	TRACE();
+	
+	PED_ASSERT (part != NULL, return 0);
+	PED_ASSERT (part->disk != NULL, return 0);
+
+	/* never change the partition numbers */
+	if (part->num != -1)
+		return 1;
+	for (i = 1; i <= AMIGA_MAX_PARTITIONS; i++) {
+		p = ped_disk_get_partition (part->disk, i);
+		if (!p) {
+			part->num = i;
+			return 1;
+		}
+	}
+
+	/* failed to allocate a number */
+#ifndef DISCOVER_ONLY
+	ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			     _("%s : Unable to allocate a partition"), __func__);
+#endif
+	return 0;
+}
+
+static int
+amiga_alloc_metadata (PedDisk* disk)
+{
+	PedPartition*		new_part;
+	PedConstraint*		constraint_any = NULL;
+	PedSector		highest_block;
+	TRACE();
+
+	PED_ASSERT (disk != NULL, goto error);
+	PED_ASSERT (disk->dev != NULL, goto error);
+
+	constraint_any = ped_constraint_any (disk->dev);
+
+	/* Allocate space for the RDB */
+	new_part = ped_partition_new (disk, PED_PARTITION_METADATA, NULL, 0, MAX_RDB_BLOCK);
+	if (!new_part)
+		goto error;
+
+	if (!ped_disk_add_partition (disk, new_part, constraint_any)) {
+		ped_partition_destroy (new_part);
+		goto error;
+	}
+
+	ped_constraint_destroy (constraint_any);
+	return 1;
+error:
+	ped_constraint_destroy (constraint_any);
+	return 0;
+}
+
+static int
+amiga_get_max_primary_partition_count (const PedDisk* disk)
+{
+	TRACE();
+	return AMIGA_MAX_PARTITIONS;
+}
+
+static PedDiskOps amiga_disk_ops = {
+	probe:			amiga_probe,
+#ifndef DISCOVER_ONLY
+	clobber:		amiga_clobber,
+#else
+	clobber:		NULL,
+#endif
+	alloc:			amiga_alloc,
+	duplicate:		amiga_duplicate,
+	free:			amiga_free,
+	read:			amiga_read,
+#ifndef DISCOVER_ONLY
+	write:			amiga_write,
+#else
+	write:			NULL,
+#endif
+
+	partition_new:		amiga_partition_new,
+	partition_duplicate:	amiga_partition_duplicate,
+	partition_destroy:	amiga_partition_destroy,
+	partition_set_system:	amiga_partition_set_system,
+	partition_set_flag:	amiga_partition_set_flag,
+	partition_get_flag:	amiga_partition_get_flag,
+	partition_is_flag_available:
+				amiga_partition_is_flag_available,
+	partition_set_name:	amiga_partition_set_name,
+	partition_get_name:	amiga_partition_get_name,
+	partition_align:	amiga_partition_align,
+	partition_enumerate:	amiga_partition_enumerate,
+
+
+	alloc_metadata:		amiga_alloc_metadata,
+	get_max_primary_partition_count:
+				amiga_get_max_primary_partition_count
+};
+
+static PedDiskType amiga_disk_type = {
+	next:		NULL,
+	name:		"amiga",
+	ops:		&amiga_disk_ops,
+	features:	PED_DISK_TYPE_PARTITION_NAME
+};
+
+void
+ped_disk_amiga_init ()
+{
+	TRACE();
+	PED_ASSERT(sizeof(struct AmigaBlock) != 3, return);
+	PED_ASSERT(sizeof(struct RigidDiskBlock) != 64, return);
+	PED_ASSERT(sizeof(struct PartitionBlock) != 64, return);
+	PED_ASSERT(sizeof(struct LinkedBlock) != 5, return);
+	PED_ASSERT(sizeof(struct Linked2Block) != 18, return);
+
+	ped_register_disk_type (&amiga_disk_type);
+}
+
+void
+ped_disk_amiga_done ()
+{
+	TRACE();
+
+	ped_unregister_disk_type (&amiga_disk_type);
+}
diff -Naur parted-1.6.9.orig/libparted/fs_amiga/Makefile.am parted-1.6.9/libparted/fs_amiga/Makefile.am
--- parted-1.6.9.orig/libparted/fs_amiga/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ parted-1.6.9/libparted/fs_amiga/Makefile.am	2004-05-10 21:03:41.000000000 +0200
@@ -0,0 +1,14 @@
+partedincludedir      =	-I$(top_srcdir)/include
+
+noinst_LTLIBRARIES    =	libamigafs.la
+libamigafs_la_SOURCES    =	amiga.h		\
+			amiga.c		\
+			affs.h		\
+			affs.c		\
+			asfs.h		\
+			asfs.c		\
+			apfs.h		\
+			apfs.c		\
+			interface.c
+
+INCLUDES = $(partedincludedir) @INTLINCS@
diff -Naur parted-1.6.9.orig/libparted/fs_amiga/Makefile.in parted-1.6.9/libparted/fs_amiga/Makefile.in
--- parted-1.6.9.orig/libparted/fs_amiga/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ parted-1.6.9/libparted/fs_amiga/Makefile.in	2004-05-10 21:03:41.000000000 +0200
@@ -0,0 +1,445 @@
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GMSGFMT = @GMSGFMT@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLINCS = @INTLINCS@
+INTLLIBS = @INTLLIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_RELEASE = @LT_RELEASE@
+LT_REVISION = @LT_REVISION@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OS_LIBS = @OS_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PARTEDLDFLAGS = @PARTEDLDFLAGS@
+PARTED_LIBS = @PARTED_LIBS@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+REISER_LIBS = @REISER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+UUID_LIBS = @UUID_LIBS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+partedincludedir = -I$(top_srcdir)/include
+
+noinst_LTLIBRARIES = libamigafs.la
+libext2_la_SOURCES = amiga.h		\
+			amiga.c		\
+			affs.h		\
+			affs.c		\
+			asfs.h		\
+			asfs.c		\
+			apfs.h		\
+			apfs.c		\
+			interface.c
+
+
+INCLUDES = $(partedincludedir) @INTLINCS@
+subdir = libparted/fs_amiga
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+
+libamigafs_la_LDFLAGS =
+libamigafs_la_LIBADD =
+libamigafs_la_SOURCES = libamigafs.la.c
+libamigafs_la_OBJECTS = libamigafs.la.lo
+
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libamigafs.la.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+DIST_SOURCES = libamigafs.la.c
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+SOURCES = libamigafs.la.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  libparted/fs_amiga/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" = "$$p" && dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libamigafs.la: $(libamigafs_la_OBJECTS) $(libamigafs_la_DEPENDENCIES) 
+	$(LINK)  $(libamigafs_la_LDFLAGS) $(libamigafs_la_OBJECTS) $(libamigafs_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamigafs.la.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am info info-am install \
+	install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Naur parted-1.6.9.orig/libparted/fs_amiga/affs.c parted-1.6.9/libparted/fs_amiga/affs.c
--- parted-1.6.9.orig/libparted/fs_amiga/affs.c	1970-01-01 01:00:00.000000000 +0100
+++ parted-1.6.9/libparted/fs_amiga/affs.c	2004-05-10 21:03:41.000000000 +0200
@@ -0,0 +1,447 @@
+/*
+    affs.c -- parted suppoer for affs filesystems
+    Copyright (C) 1998-2000 Free Software Foundation, Inc.
+  
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <parted/parted.h>
+#include <parted/debug.h>
+#include <parted/endian.h>
+
+#include "amiga.h"
+#include "affs.h"
+
+#if ENABLE_NLS
+#  include <libintl.h>
+#  define _(String) dgettext (PACKAGE, String)
+#else
+#  define _(String) (String)
+#endif /* ENABLE_NLS */
+
+static int
+_affs_probe_root (uint32_t *block, int blocksize) {
+	int i;
+	uint32_t sum;
+
+	if (PED_BE32_TO_CPU (block[0]) != 2) return 0;
+	if (PED_BE32_TO_CPU (block[128*blocksize-1]) != 1) return 0;
+	for (i = 0, sum = 0; i < 128*blocksize; i++)
+		sum += PED_BE32_TO_CPU (block[i]);
+	if (sum) return 0;
+	return 1;
+}
+
+static PedGeometry*
+_generic_affs_probe (PedGeometry* geom, uint32_t kind)
+{
+	uint32_t *block;
+	int32_t i;
+	PedSector root, len, pos;
+	struct PartitionBlock * part;
+	int blocksize = 1, reserved = 2, prealloc = 0;
+
+	PED_ASSERT (geom != NULL, return NULL);
+	PED_ASSERT (geom->dev != NULL, return NULL);
+
+	/* Finds the blocksize, prealloc and reserved values of the partition block */
+	if (!(part = ped_malloc (PED_SECTOR_SIZE*blocksize))) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate partition block\n"), __func__);
+		goto error_part;
+	}
+	if (amiga_find_part(geom, part) != NULL) {
+		prealloc = PED_BE32_TO_CPU (part->de_PreAlloc);
+		reserved = PED_BE32_TO_CPU (part->de_Reserved);
+		reserved = reserved == 0 ? 1 : reserved;
+		blocksize = PED_BE32_TO_CPU (part->de_SizeBlock)
+			* PED_BE32_TO_CPU (part->de_SectorPerBlock) / 128;
+	}
+	ped_free (part);
+
+	/* Test boot block */
+	if (!(block = ped_malloc (PED_SECTOR_SIZE*blocksize))) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate block\n"), __func__);
+		goto error_block;
+	}
+	if (!ped_device_read (geom->dev, block, geom->start, blocksize)) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Couldn't read boot block %llu\n"), __func__, geom->start);
+		goto error;
+	}
+	if (PED_BE32_TO_CPU (block[0]) != kind) {
+		goto error;
+	}
+
+	/* Find and test the root block */
+	len = geom->length / blocksize - reserved;
+	pos = (len - 1) / 2;
+	root = geom->start + (pos + reserved) * blocksize;
+	printf ("Pralloc = %d, Reserved = %d, blocksize = %d, root block at %llu\n",
+		prealloc, reserved, blocksize, root);
+
+	if (!ped_device_read (geom->dev, block, root, blocksize)) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Couldn't read root block %llu\n"), __func__, root);
+		goto error;
+	}
+	if (_affs_probe_root(block, blocksize) == 1) {
+		ped_free (block);
+		return ped_geometry_duplicate (geom);
+	}
+
+error:
+	ped_free (block);
+error_block:
+error_part:
+	return NULL;
+}
+static PedGeometry*
+_affs0_probe (PedGeometry* geom) {
+	return _generic_affs_probe (geom, 0x444f5300);
+}
+static PedGeometry*
+_affs1_probe (PedGeometry* geom) {
+	return _generic_affs_probe (geom, 0x444f5301);
+}
+static PedGeometry*
+_affs2_probe (PedGeometry* geom) {
+	return _generic_affs_probe (geom, 0x444f5302);
+}
+static PedGeometry*
+_affs3_probe (PedGeometry* geom) {
+	return _generic_affs_probe (geom, 0x444f5303);
+}
+static PedGeometry*
+_affs4_probe (PedGeometry* geom) {
+	return _generic_affs_probe (geom, 0x444f5304);
+}
+static PedGeometry*
+_affs5_probe (PedGeometry* geom) {
+	return _generic_affs_probe (geom, 0x444f5305);
+}
+static PedGeometry*
+_affs6_probe (PedGeometry* geom) {
+	return _generic_affs_probe (geom, 0x444f5306);
+}
+static PedGeometry*
+_affs7_probe (PedGeometry* geom) {
+	return _generic_affs_probe (geom, 0x444f5307);
+}
+static PedGeometry*
+_amufs_probe (PedGeometry* geom) {
+	return _generic_affs_probe (geom, 0x6d754653);
+}
+static PedGeometry*
+_amufs0_probe (PedGeometry* geom) {
+	return _generic_affs_probe (geom, 0x6d754600);
+}
+static PedGeometry*
+_amufs1_probe (PedGeometry* geom) {
+	return _generic_affs_probe (geom, 0x6d754601);
+}
+static PedGeometry*
+_amufs2_probe (PedGeometry* geom) {
+	return _generic_affs_probe (geom, 0x6d754602);
+}
+static PedGeometry*
+_amufs3_probe (PedGeometry* geom) {
+	return _generic_affs_probe (geom, 0x6d754603);
+}
+static PedGeometry*
+_amufs4_probe (PedGeometry* geom) {
+	return _generic_affs_probe (geom, 0x6d754604);
+}
+static PedGeometry*
+_amufs5_probe (PedGeometry* geom) {
+	return _generic_affs_probe (geom, 0x6d754605);
+}
+
+static PedFileSystemOps _affs0_ops = {
+	probe:		_affs0_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+static PedFileSystemOps _affs1_ops = {
+	probe:		_affs1_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+static PedFileSystemOps _affs2_ops = {
+	probe:		_affs2_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+static PedFileSystemOps _affs3_ops = {
+	probe:		_affs3_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+static PedFileSystemOps _affs4_ops = {
+	probe:		_affs4_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+static PedFileSystemOps _affs5_ops = {
+	probe:		_affs5_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+static PedFileSystemOps _affs6_ops = {
+	probe:		_affs6_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+static PedFileSystemOps _affs7_ops = {
+	probe:		_affs7_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+static PedFileSystemOps _amufs_ops = {
+	probe:		_amufs_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+static PedFileSystemOps _amufs0_ops = {
+	probe:		_amufs0_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+static PedFileSystemOps _amufs1_ops = {
+	probe:		_amufs1_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+static PedFileSystemOps _amufs2_ops = {
+	probe:		_amufs2_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+static PedFileSystemOps _amufs3_ops = {
+	probe:		_amufs3_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+static PedFileSystemOps _amufs4_ops = {
+	probe:		_amufs4_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+static PedFileSystemOps _amufs5_ops = {
+	probe:		_amufs5_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+
+PedFileSystemType _affs0_type = {
+       next:		 NULL,
+       ops:		 &_affs0_ops,
+       name:		 "affs0"
+};
+PedFileSystemType _affs1_type = {
+       next:		 NULL,
+       ops:		 &_affs1_ops,
+       name:		 "affs1"
+};
+PedFileSystemType _affs2_type = {
+       next:		 NULL,
+       ops:		 &_affs2_ops,
+       name:		 "affs2"
+};
+PedFileSystemType _affs3_type = {
+       next:		 NULL,
+       ops:		 &_affs3_ops,
+       name:		 "affs3"
+};
+PedFileSystemType _affs4_type = {
+       next:		 NULL,
+       ops:		 &_affs4_ops,
+       name:		 "affs4"
+};
+PedFileSystemType _affs5_type = {
+       next:		 NULL,
+       ops:		 &_affs5_ops,
+       name:		 "affs5"
+};
+PedFileSystemType _affs6_type = {
+       next:		 NULL,
+       ops:		 &_affs6_ops,
+       name:		 "affs6"
+};
+PedFileSystemType _affs7_type = {
+       next:		 NULL,
+       ops:		 &_affs7_ops,
+       name:		 "affs7"
+};
+PedFileSystemType _amufs_type = {
+       next:		 NULL,
+       ops:		 &_amufs_ops,
+       name:		 "amufs"
+};
+PedFileSystemType _amufs0_type = {
+       next:		 NULL,
+       ops:		 &_amufs0_ops,
+       name:		 "amufs0"
+};
+PedFileSystemType _amufs1_type = {
+       next:		 NULL,
+       ops:		 &_amufs1_ops,
+       name:		 "amufs1"
+};
+PedFileSystemType _amufs2_type = {
+       next:		 NULL,
+       ops:		 &_amufs2_ops,
+       name:		 "amufs2"
+};
+PedFileSystemType _amufs3_type = {
+       next:		 NULL,
+       ops:		 &_amufs3_ops,
+       name:		 "amufs3"
+};
+PedFileSystemType _amufs4_type = {
+       next:		 NULL,
+       ops:		 &_amufs4_ops,
+       name:		 "amufs4"
+};
+PedFileSystemType _amufs5_type = {
+       next:		 NULL,
+       ops:		 &_amufs5_ops,
+       name:		 "amufs5"
+};
diff -Naur parted-1.6.9.orig/libparted/fs_amiga/affs.h parted-1.6.9/libparted/fs_amiga/affs.h
--- parted-1.6.9.orig/libparted/fs_amiga/affs.h	1970-01-01 01:00:00.000000000 +0100
+++ parted-1.6.9/libparted/fs_amiga/affs.h	2004-05-10 21:03:41.000000000 +0200
@@ -0,0 +1,20 @@
+
+/*
+    affs.h -- parted suppoer for affs filesystems header files
+    Copyright (C) 1998-2000 Free Software Foundation, Inc.
+  
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
diff -Naur parted-1.6.9.orig/libparted/fs_amiga/amiga.c parted-1.6.9/libparted/fs_amiga/amiga.c
--- parted-1.6.9.orig/libparted/fs_amiga/amiga.c	1970-01-01 01:00:00.000000000 +0100
+++ parted-1.6.9/libparted/fs_amiga/amiga.c	2004-05-10 21:03:41.000000000 +0200
@@ -0,0 +1,382 @@
+/* 
+    libparted/fs_amiga - amiga filesystem support.
+    Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+    Contributor:  Sven Luther <luther@debian.org>
+*/
+
+#include <string.h>
+#include <parted/parted.h>
+#include <parted/debug.h>
+#include <parted/endian.h>
+
+#include "amiga.h"
+
+#if ENABLE_NLS
+#  include <libintl.h>
+#  define _(String) dgettext (PACKAGE, String)
+#else
+#  define _(String) (String)
+#endif /* ENABLE_NLS */
+
+/* String manipulation */
+static void _amiga_set_bstr (const char *cstr, char *bstr, int maxsize) {
+	int size = strlen (cstr);
+	int i;
+
+	if (size >= maxsize) return;
+	bstr[0] = size;
+	for (i = 0; i<size; i++) bstr[i+1] = cstr[i];
+}
+static const char * _amiga_get_bstr (char * bstr) {
+	char * cstr = bstr + 1;
+	int size = bstr[0];
+	
+	cstr[size] = '\0';
+	return cstr;
+}
+
+#define	IDNAME_RIGIDDISK	0x5244534B	/* 'RDSK' */
+#define IDNAME_BADBLOCK		0x42414442	/* 'BADB' */
+#define	IDNAME_PARTITION	0x50415254	/* 'PART' */
+#define IDNAME_FILESYSHEADER	0x46534844	/* 'FSHD' */
+#define IDNAME_LOADSEG		0x4C534547	/* 'LSEG' */
+#define IDNAME_BOOT		0x424f4f54	/* 'BOOT' */
+#define IDNAME_FREE		0xffffffff	
+
+static const char *
+_amiga_block_id (uint32_t id) {
+	switch (id) {
+		case IDNAME_RIGIDDISK :
+			return "RDSK";
+		case IDNAME_BADBLOCK :
+			return "BADB";
+		case IDNAME_PARTITION :
+			return "PART";
+		case IDNAME_FILESYSHEADER :
+			return "FSHD";
+		case IDNAME_LOADSEG :
+			return "LSEG";
+		case IDNAME_BOOT :
+			return "BOOT";
+		case IDNAME_FREE :
+			return "<free>";
+		default :
+			return "<unknown>";
+	}
+}
+static int
+_amiga_valid_block_id (uint32_t id) {
+	switch (id) {
+		case IDNAME_RIGIDDISK :
+		case IDNAME_BADBLOCK :
+		case IDNAME_PARTITION :
+		case IDNAME_FILESYSHEADER :
+		case IDNAME_LOADSEG :
+		case IDNAME_BOOT :
+			return 1;
+		case IDNAME_FREE :
+		default :
+			return 0;
+	}
+}
+
+struct AmigaIds *
+_amiga_add_id (uint32_t id, struct AmigaIds *ids) {
+	struct AmigaIds *newid;
+
+	if ((newid=ped_malloc(sizeof (struct AmigaIds)))==NULL) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate id list element\n"), __func__);
+		return 0;
+	}
+	newid->ID = id;
+	newid->next = ids;
+	return newid;
+}
+
+void
+_amiga_free_ids (struct AmigaIds *ids) {
+	struct AmigaIds *current, *next;
+
+	for (current = ids; current != NULL; current = next) {
+		next = current->next;
+		ped_free (current);
+	}
+}
+int
+_amiga_id_in_list (uint32_t id, struct AmigaIds *ids) {
+	struct AmigaIds *current;
+
+	for (current = ids; current != NULL; current = current->next) {
+		if (id == current->ID)
+			return 1;
+	}
+	return 0;
+}
+
+#define AMIGA_RDB_NOT_FOUND	((uint32_t)0xffffffff)
+
+struct AmigaBlock {
+    uint32_t	amiga_ID;		/* Identifier 32 bit word */
+    uint32_t	amiga_SummedLongss;	/* Size of the structure for checksums */
+    int32_t	amiga_ChkSum;		/* Checksum of the structure */
+};
+#define AMIGA(pos) ((struct AmigaBlock *)(pos)) 
+
+struct RigidDiskBlock {
+    uint32_t	rdb_ID;			/* Identifier 32 bit word : 'RDSK' */
+    uint32_t	rdb_SummedLongs;	/* Size of the structure for checksums */
+    int32_t	rdb_ChkSum;		/* Checksum of the structure */
+    uint32_t	rdb_HostID;		/* SCSI Target ID of host, not really used */
+    uint32_t	rdb_BlockBytes;		/* Size of disk blocks */
+    uint32_t	rdb_Flags;		/* RDB Flags */
+    /* block list heads */
+    uint32_t	rdb_BadBlockList;	/* Bad block list */
+    uint32_t	rdb_PartitionList;	/* Partition list */
+    uint32_t	rdb_FileSysHeaderList;	/* File system header list */
+    uint32_t	rdb_DriveInit;		/* Drive specific init code */
+    uint32_t	rdb_BootBlockList;	/* Amiga OS 4 Boot Blocks */
+    uint32_t	rdb_Reserved1[5];	/* Unused word, need to be set to $ffffffff */
+    /* physical drive characteristics */
+    uint32_t	rdb_Cylinders;		/* Number of the cylinders of the drive */
+    uint32_t	rdb_Sectors;		/* Number of sectors of the drive */
+    uint32_t	rdb_Heads;		/* Number of heads of the drive */
+    uint32_t	rdb_Interleave;		/* Interleave */
+    uint32_t	rdb_Park;		/* Head parking cylinder */
+    uint32_t	rdb_Reserved2[3];	/* Unused word, need to be set to $ffffffff */
+    uint32_t	rdb_WritePreComp;	/* Starting cylinder of write precompensation */
+    uint32_t	rdb_ReducedWrite;	/* Starting cylinder of reduced write current */
+    uint32_t	rdb_StepRate;		/* Step rate of the drive */
+    uint32_t	rdb_Reserved3[5];	/* Unused word, need to be set to $ffffffff */
+    /* logical drive characteristics */
+    uint32_t	rdb_RDBBlocksLo;	/* low block of range reserved for hardblocks */
+    uint32_t	rdb_RDBBlocksHi;	/* high block of range for these hardblocks */
+    uint32_t	rdb_LoCylinder;		/* low cylinder of partitionable disk area */
+    uint32_t	rdb_HiCylinder;		/* high cylinder of partitionable data area */
+    uint32_t	rdb_CylBlocks;		/* number of blocks available per cylinder */
+    uint32_t	rdb_AutoParkSeconds;	/* zero for no auto park */
+    uint32_t	rdb_HighRDSKBlock;	/* highest block used by RDSK */
+					/* (not including replacement bad blocks) */
+    uint32_t	rdb_Reserved4;
+    /* drive identification */
+    char	rdb_DiskVendor[8];
+    char	rdb_DiskProduct[16];
+    char	rdb_DiskRevision[4];
+    char	rdb_ControllerVendor[8];
+    char	rdb_ControllerProduct[16];
+    char	rdb_ControllerRevision[4];
+    uint32_t	rdb_Reserved5[10];
+};
+
+#define AMIGA_MAX_PARTITIONS	128
+#define	RDB_LOCATION_LIMIT	16
+#define RDSK(pos) ((struct RigidDiskBlock *)(pos)) 
+
+static int
+_amiga_checksum (struct AmigaBlock *blk) {
+	uint32_t *rdb = (uint32_t *) blk;
+	uint32_t sum;
+	int i, end;
+
+	sum = PED_BE32_TO_CPU (rdb[0]);
+	end = PED_BE32_TO_CPU (rdb[1]);
+
+	if (end > PED_SECTOR_SIZE) end = PED_SECTOR_SIZE;
+
+	for (i = 1; i < end; i++) sum += PED_BE32_TO_CPU (rdb[i]);
+
+	return sum;
+}
+
+static void
+_amiga_calculate_checksum (struct AmigaBlock *blk) {
+
+	blk->amiga_ChkSum = PED_CPU_TO_BE32(
+		PED_BE32_TO_CPU(blk->amiga_ChkSum) -
+		_amiga_checksum((struct AmigaBlock *) blk));
+	return;	
+}
+
+
+static struct AmigaBlock *
+_amiga_read_block (PedDevice *dev, struct AmigaBlock *blk, PedSector block, struct AmigaIds *ids) {
+	if (!ped_device_read (dev, blk, block, 1)) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Couldn't read block %llu\n"), __func__, block))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return NULL;
+		}
+	}
+	if (ids && !_amiga_id_in_list(PED_BE32_TO_CPU(blk->amiga_ID), ids))
+		return NULL;
+	if (_amiga_checksum (blk) != 0) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_FIX | PED_EXCEPTION_IGNORE | PED_EXCEPTION_CANCEL,
+			_("%s : Bad checksum on block %llu of type %s\n"),
+			__func__, block, _amiga_block_id(PED_BE32_TO_CPU(blk->amiga_ID))))
+		{
+			case PED_EXCEPTION_CANCEL :
+				return NULL;
+			case PED_EXCEPTION_FIX :
+				_amiga_calculate_checksum(AMIGA(blk));
+				if (!ped_device_write (dev, blk, block, 1)) {
+					switch (ped_exception_throw(PED_EXCEPTION_FATAL,
+						PED_EXCEPTION_CANCEL,
+						_("%s : Couldn't write block %d\n"), __func__, block))
+					{
+						case PED_EXCEPTION_CANCEL :
+						case PED_EXCEPTION_UNHANDLED :
+						default : 
+							return NULL;
+					}
+				}
+			case PED_EXCEPTION_IGNORE :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return blk;
+		}
+	}
+	return blk;
+}
+
+static uint32_t
+_amiga_find_rdb (PedDevice *dev, struct RigidDiskBlock *rdb) {
+	int i;
+	struct AmigaIds *ids;
+	
+	ids = _amiga_add_id (IDNAME_RIGIDDISK, NULL);
+
+	for (i = 0; i<RDB_LOCATION_LIMIT; i++) {
+		if (!_amiga_read_block (dev, AMIGA(rdb), i, ids)) {
+			continue;
+		}
+		if (PED_BE32_TO_CPU (rdb->rdb_ID) == IDNAME_RIGIDDISK) {
+			_amiga_free_ids (ids);
+			return i;
+		}
+	}
+	_amiga_free_ids (ids);
+	return AMIGA_RDB_NOT_FOUND;
+}
+
+static int
+_amiga_loop_check (uint32_t block, uint32_t * blocklist, uint32_t max)
+{
+	uint32_t i;
+
+	for (i = 0; i < max; i++)
+		if (block == blocklist[i]) {
+			/* We are looping, let's stop.  */
+			return 1;
+		}
+	blocklist[max] = block;
+	return 0;
+}
+
+/* We have already allocated a rdb, we are now reading it from the disk */
+struct PartitionBlock *
+amiga_find_part (PedGeometry *geom, struct PartitionBlock *part)
+{
+	struct RigidDiskBlock *rdb;
+	uint32_t partblock;
+	uint32_t partlist[AMIGA_MAX_PARTITIONS];
+	int i;
+
+	PED_ASSERT(geom!= NULL, return NULL);
+	PED_ASSERT(geom->dev!= NULL, return NULL);
+
+	if (!(rdb = ped_malloc (PED_SECTOR_SIZE))) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate disk_specific rdb block\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				return NULL;
+		}
+	}
+	if (_amiga_find_rdb (geom->dev, rdb) == AMIGA_RDB_NOT_FOUND) {
+		switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+			PED_EXCEPTION_CANCEL,
+			_("%s : Didn't find rdb block, should never happen\n"), __func__))
+		{
+			case PED_EXCEPTION_CANCEL :
+			case PED_EXCEPTION_UNHANDLED :
+			default : 
+				ped_free(rdb);
+				return NULL;
+		}
+	}
+
+	/* We initialize the hardblock free list to detect loops */
+	for (i = 0; i < AMIGA_MAX_PARTITIONS; i++) partlist[i] = 0xffffffff;
+
+	for (i = 1, partblock = PED_BE32_TO_CPU(rdb->rdb_PartitionList);
+		i < AMIGA_MAX_PARTITIONS && partblock != 0xffffffff;
+		i++, partblock = PED_BE32_TO_CPU(part->pb_Next))
+	{
+		PedSector start, end;
+		PedSector cylblocks;
+
+		/* Let's look for loops in the partition table */
+		if (_amiga_loop_check(partblock, partlist, i)) {
+			ped_free (rdb);
+			return NULL;
+		}
+		/* Let's read a partition block to get its geometry*/
+		if (!ped_device_read (geom->dev, part, (PedSector)partblock, 1)) {
+			switch (ped_exception_throw(PED_EXCEPTION_ERROR,
+				PED_EXCEPTION_CANCEL,
+				_("%s : Failed to to read partition block %llu\n"),
+				__func__, (PedSector)partblock))
+			{
+				case PED_EXCEPTION_CANCEL :
+				case PED_EXCEPTION_UNHANDLED :
+				default : 
+					ped_free(rdb);
+					return NULL;
+			}
+		}
+
+		/* Current block is not a Partition Block */
+		if (part->pb_ID != IDNAME_PARTITION) {
+			ped_free (rdb);
+			return NULL;
+		}
+
+		/* Calculate the geometry of the partition */
+		cylblocks = ((PedSector) PED_BE32_TO_CPU (part->de_Surfaces)) *
+			((PedSector) PED_BE32_TO_CPU (part->de_BlocksPerTrack));
+		start = ((PedSector) PED_BE32_TO_CPU (part->de_LowCyl)) * cylblocks;
+		end = ((((PedSector) PED_BE32_TO_CPU (part->de_HighCyl))+1) * (cylblocks))-1;
+
+		/* And check if it is the one we are searching for */
+		if (start == geom->start && end == geom->end) {
+			ped_free (rdb);
+			return part;
+		}
+	}
+
+	ped_free (rdb);
+	return NULL;
+}
diff -Naur parted-1.6.9.orig/libparted/fs_amiga/amiga.h parted-1.6.9/libparted/fs_amiga/amiga.h
--- parted-1.6.9.orig/libparted/fs_amiga/amiga.h	1970-01-01 01:00:00.000000000 +0100
+++ parted-1.6.9/libparted/fs_amiga/amiga.h	2004-05-10 21:03:41.000000000 +0200
@@ -0,0 +1,71 @@
+/*
+    util.h -- amiga partition table headers.
+    Copyright (C) 1998-2000 Free Software Foundation, Inc.
+  
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+struct PartitionBlock {
+    uint32_t	pb_ID;			/* Identifier 32 bit word : 'PART' */
+    uint32_t	pb_SummedLongs;		/* Size of the structure for checksums */
+    int32_t	pb_ChkSum;		/* Checksum of the structure */
+    uint32_t	pb_HostID;		/* SCSI Target ID of host, not really used */
+    uint32_t	pb_Next;		/* Block number of the next PartitionBlock */
+    uint32_t	pb_Flags;		/* Part Flags (NOMOUNT and BOOTABLE) */
+    uint32_t	pb_Reserved1[2];
+    uint32_t	pb_DevFlags;		/* Preferred flags for OpenDevice */
+    uint8_t	pb_DriveName[32];	/* Preferred DOS device name: BSTR form */
+    uint32_t	pb_Reserved2[15];
+    uint32_t	de_TableSize;		/* Size of Environment vector */
+    uint32_t	de_SizeBlock;		/* Size of the blocks in 32 bit words, usually 128 */
+    uint32_t	de_SecOrg;	     	/* Not used; must be 0 */
+    uint32_t	de_Surfaces;		/* Number of heads (surfaces) */
+    uint32_t	de_SectorPerBlock;	/* Disk sectors per block, used with SizeBlock, usually 1 */
+    uint32_t	de_BlocksPerTrack;	/* Blocks per track. drive specific */
+    uint32_t	de_Reserved;		/* DOS reserved blocks at start of partition. */
+    uint32_t	de_PreAlloc;		/* DOS reserved blocks at end of partition */
+    uint32_t	de_Interleave;		/* Not used, usually 0 */
+    uint32_t	de_LowCyl;		/* First cylinder of the partition */
+    uint32_t	de_HighCyl;		/* Last cylinder of the partition */
+    uint32_t	de_NumBuffers;		/* Initial # DOS of buffers.  */
+    uint32_t	de_BufMemType;		/* Type of mem to allocate for buffers */
+    uint32_t	de_MaxTransfer;		/* Max number of bytes to transfer at a time */
+    uint32_t	de_Mask;		/* Address Mask to block out certain memory */
+    int32_t	de_BootPri;		/* Boot priority for autoboot */
+    uint32_t	de_DosType;		/* Dostype of the filesystem */
+    uint32_t	de_Baud;		/* Baud rate for serial handler */
+    uint32_t	de_Control;		/* Control word for handler/filesystem */
+    uint32_t	de_BootBlocks;		/* Number of blocks containing boot code */
+    uint32_t	pb_EReserved[12];
+};
+
+#define PART(pos) ((struct PartitionBlock *)(pos))
+
+#define	PBFB_BOOTABLE	0	/* this partition is intended to be bootable */
+#define	PBFF_BOOTABLE	1L	/*   (expected directories and files exist) */
+#define	PBFB_NOMOUNT	1	/* do not mount this partition (e.g. manually */
+#define	PBFF_NOMOUNT	2L	/*   mounted, but space reserved here) */
+
+struct PartitionBlock * amiga_find_part (PedGeometry *geom, struct PartitionBlock *part);
+
+struct AmigaIds {
+	uint32_t ID;
+	struct AmigaIds *next;
+};
+
+struct AmigaIds * _amiga_add_id (uint32_t id, struct AmigaIds *ids);
+void _amiga_free_ids (struct AmigaIds *ids);
+int _amiga_id_in_list (uint32_t id, struct AmigaIds *ids);
+
diff -Naur parted-1.6.9.orig/libparted/fs_amiga/apfs.c parted-1.6.9/libparted/fs_amiga/apfs.c
--- parted-1.6.9.orig/libparted/fs_amiga/apfs.c	1970-01-01 01:00:00.000000000 +0100
+++ parted-1.6.9/libparted/fs_amiga/apfs.c	2004-05-10 21:03:41.000000000 +0200
@@ -0,0 +1,150 @@
+/*
+    apfs.c -- parted support for apfs filesystems
+    Copyright (C) 1998-2000 Free Software Foundation, Inc.
+  
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <parted/parted.h>
+#include <parted/debug.h>
+#include <parted/endian.h>
+
+#include "amiga.h"
+#include "apfs.h"
+
+#if ENABLE_NLS
+#  include <libintl.h>
+#  define _(String) dgettext (PACKAGE, String)
+#else
+#  define _(String) (String)
+#endif /* ENABLE_NLS */
+
+static int
+_apfs_probe_root (uint32_t *block, uint32_t blocksize, uint32_t kind) {
+	if (PED_BE32_TO_CPU (block[0]) != kind) return 0;
+	return 1;
+}
+
+static PedGeometry*
+_generic_apfs_probe (PedGeometry* geom, uint32_t kind)
+{
+	uint32_t *block;
+	int32_t i, sum;
+	PedSector root;
+	struct PartitionBlock * part;
+	uint32_t blocksize = 1, reserved = 2, prealloc = 0;
+
+	PED_ASSERT (geom != NULL, return NULL);
+	PED_ASSERT (geom->dev != NULL, return NULL);
+
+	/* Finds the blocksize, prealloc and reserved values of the partition block */
+	if (!(part = ped_malloc (PED_SECTOR_SIZE*blocksize))) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate partition block\n"), __func__);
+		goto error_part;
+	}
+	if (amiga_find_part(geom, part) != NULL) {
+		prealloc = PED_BE32_TO_CPU (part->de_PreAlloc);
+		reserved = PED_BE32_TO_CPU (part->de_Reserved);
+		blocksize = PED_BE32_TO_CPU (part->de_SizeBlock)
+			* PED_BE32_TO_CPU (part->de_SectorPerBlock) / 128;
+	}
+	ped_free (part);
+
+	/* Test boot block */
+	if (!(block = ped_malloc (PED_SECTOR_SIZE*blocksize))) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate block\n"), __func__);
+		goto error_block;
+	}
+	if (!ped_device_read (geom->dev, block, geom->start, blocksize)) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Couldn't read boot block %llu\n"), __func__, geom->start);
+		goto error;
+	}
+	if (PED_BE32_TO_CPU (block[0]) != kind) {
+		goto error;
+	}
+
+	/* Find and test the root block */
+	root = geom->start+reserved*blocksize;
+	if (!ped_device_read (geom->dev, block, root, blocksize)) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Couldn't read root block %llu\n"), __func__, root);
+		goto error;
+	}
+	if (_apfs_probe_root(block, blocksize, kind) == 1) {
+		ped_free(block);
+		return ped_geometry_duplicate (geom);
+	}
+
+error:
+	ped_free (block);
+error_block:
+error_part:
+	return NULL;
+}
+
+static PedGeometry*
+_apfs1_probe (PedGeometry* geom) {
+	return _generic_apfs_probe (geom, 0x50463101);
+}
+
+static PedGeometry*
+_apfs2_probe (PedGeometry* geom) {
+	return _generic_apfs_probe (geom, 0x50463102);
+}
+
+static PedFileSystemOps _apfs1_ops = {
+	probe:		_apfs1_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+static PedFileSystemOps _apfs2_ops = {
+	probe:		_apfs2_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+
+PedFileSystemType _apfs1_type = {
+       next:		 NULL,
+       ops:		 &_apfs1_ops,
+       name:		 "apfs1"
+};
+PedFileSystemType _apfs2_type = {
+       next:		 NULL,
+       ops:		 &_apfs2_ops,
+       name:		 "apfs2"
+};
diff -Naur parted-1.6.9.orig/libparted/fs_amiga/apfs.h parted-1.6.9/libparted/fs_amiga/apfs.h
--- parted-1.6.9.orig/libparted/fs_amiga/apfs.h	1970-01-01 01:00:00.000000000 +0100
+++ parted-1.6.9/libparted/fs_amiga/apfs.h	2004-05-10 21:03:41.000000000 +0200
@@ -0,0 +1,19 @@
+
+/*
+    apfs.h -- parted support for apfs filesystems header files
+    Copyright (C) 1998-2000 Free Software Foundation, Inc.
+  
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
diff -Naur parted-1.6.9.orig/libparted/fs_amiga/asfs.c parted-1.6.9/libparted/fs_amiga/asfs.c
--- parted-1.6.9.orig/libparted/fs_amiga/asfs.c	1970-01-01 01:00:00.000000000 +0100
+++ parted-1.6.9/libparted/fs_amiga/asfs.c	2004-05-10 21:03:41.000000000 +0200
@@ -0,0 +1,144 @@
+/*
+    asfs.c -- parted asfs filesystem support
+    Copyright (C) 1998-2000 Free Software Foundation, Inc.
+  
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <parted/parted.h>
+#include <parted/debug.h>
+#include <parted/endian.h>
+
+#include "amiga.h"
+#include "asfs.h"
+
+#if ENABLE_NLS
+#  include <libintl.h>
+#  define _(String) dgettext (PACKAGE, String)
+#else
+#  define _(String) (String)
+#endif /* ENABLE_NLS */
+
+static int
+_asfs_probe_root (PedGeometry *geom, uint32_t *block, int blocksize, PedSector root) {
+	int i, sum;
+	PedSector start, end;
+
+	if (PED_BE32_TO_CPU (block[0]) != 0x53465300) return 0;
+	for (i = 0, sum = 1; i < 128*blocksize; i++) sum += PED_BE32_TO_CPU (block[i]);
+	if (sum != 0) return 0;
+	if (PED_BE32_TO_CPU (block[2]) * blocksize + geom->start != root) {
+		return 0;
+	}
+	start = ((((PedSector) PED_BE32_TO_CPU (block[8])) << 32)
+		+ (PedSector) PED_BE32_TO_CPU (block[9])) / 512;
+	end = (((((PedSector) PED_BE32_TO_CPU (block[10])) << 32)
+		+ (PedSector) PED_BE32_TO_CPU (block[11])) / 512) - 1;
+	if (start != geom->start || end != geom->end) return 0;
+	return 1;
+}
+
+static PedGeometry*
+_asfs_probe (PedGeometry* geom)
+{
+	uint32_t *block;
+	struct PartitionBlock * part;
+	int blocksize = 1, reserved = 1, prealloc = 1;
+	PedSector root, root2;
+	int found = 0;
+
+	PED_ASSERT (geom != NULL, return NULL);
+	PED_ASSERT (geom->dev != NULL, return NULL);
+
+	/* Finds the blocksize, prealloc and reserved values of the partition block */
+	if (!(part = ped_malloc (PED_SECTOR_SIZE*blocksize))) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate partition block\n"), __func__);
+		goto error_part;
+	}
+	if (amiga_find_part(geom, part) != NULL) {
+		prealloc = PED_BE32_TO_CPU (part->de_PreAlloc) == 0 ?
+			1 : PED_BE32_TO_CPU (part->de_PreAlloc);
+		reserved = PED_BE32_TO_CPU (part->de_Reserved) == 0 ?
+			1 : PED_BE32_TO_CPU (part->de_Reserved);
+		blocksize = PED_BE32_TO_CPU (part->de_SizeBlock)
+			* PED_BE32_TO_CPU (part->de_SectorPerBlock) / 128;
+	}
+	ped_free (part);
+
+	/* Test boot block */
+	if (!(block = ped_malloc (PED_SECTOR_SIZE*blocksize))) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Failed to allocate block\n"), __func__);
+		goto error_block;
+	}
+	root = geom->start;
+	if (!ped_device_read (geom->dev, block, root, blocksize)) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Couldn't read root block %llu\n"), __func__, root);
+		goto error;
+	}
+	if (PED_BE32_TO_CPU (block[0]) != 0x53465300) {
+		goto error;
+	}
+
+	/* Find and test the root blocks */
+	if (_asfs_probe_root(geom, block, blocksize, root)) {
+		found++;
+	}
+	root = geom->end - blocksize - (geom->length % blocksize) + 1;
+	if (!ped_device_read (geom->dev, block, root, 1)) {
+		ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
+			_("%s : Couldn't read root block %llu\n"), __func__, root);
+		goto error;
+	}
+	if (_asfs_probe_root(geom, block, blocksize, root)) {
+		found++;
+	}
+	if (found != 0) {
+		ped_free (block);
+		return ped_geometry_duplicate (geom);
+	}
+
+error:
+	ped_free (block);
+error_block:
+error_part:
+	return NULL;
+}
+
+static PedFileSystemOps _asfs_ops = {
+	probe:		_asfs_probe,
+	clobber:	NULL,
+	open:		NULL,
+	create:         NULL,
+	close:		NULL,
+	check:          NULL,
+	resize:		NULL,
+	copy:           NULL,
+	get_create_constraint:	NULL,
+	get_copy_constraint:	NULL,
+	get_resize_constraint:	NULL
+};
+
+PedFileSystemType _asfs_type = {
+       next:		 NULL,
+       ops:		 &_asfs_ops,
+       name:		 "asfs"
+};
diff -Naur parted-1.6.9.orig/libparted/fs_amiga/asfs.h parted-1.6.9/libparted/fs_amiga/asfs.h
--- parted-1.6.9.orig/libparted/fs_amiga/asfs.h	1970-01-01 01:00:00.000000000 +0100
+++ parted-1.6.9/libparted/fs_amiga/asfs.h	2004-05-10 21:03:41.000000000 +0200
@@ -0,0 +1,19 @@
+
+/*
+    asfs.h -- parted asfs filesystem support header files
+    Copyright (C) 1998-2000 Free Software Foundation, Inc.
+  
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
diff -Naur parted-1.6.9.orig/libparted/fs_amiga/interface.c parted-1.6.9/libparted/fs_amiga/interface.c
--- parted-1.6.9.orig/libparted/fs_amiga/interface.c	1970-01-01 01:00:00.000000000 +0100
+++ parted-1.6.9/libparted/fs_amiga/interface.c	2004-05-10 21:03:41.000000000 +0200
@@ -0,0 +1,90 @@
+/*
+    interface.c -- parted support amiga filesystems
+    Copyright (C) 1998-2000 Free Software Foundation, Inc.
+  
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <parted/parted.h>
+#include <parted/debug.h>
+#include <parted/endian.h>
+
+extern PedFileSystemType _affs0_type;
+extern PedFileSystemType _affs1_type;
+extern PedFileSystemType _affs2_type;
+extern PedFileSystemType _affs3_type;
+extern PedFileSystemType _affs4_type;
+extern PedFileSystemType _affs5_type;
+extern PedFileSystemType _affs6_type;
+extern PedFileSystemType _affs7_type;
+extern PedFileSystemType _amufs_type;
+extern PedFileSystemType _amufs0_type;
+extern PedFileSystemType _amufs1_type;
+extern PedFileSystemType _amufs2_type;
+extern PedFileSystemType _amufs3_type;
+extern PedFileSystemType _amufs4_type;
+extern PedFileSystemType _amufs5_type;
+extern PedFileSystemType _asfs_type;
+extern PedFileSystemType _apfs1_type;
+extern PedFileSystemType _apfs2_type;
+
+void ped_file_system_amiga_init ()
+{
+	ped_file_system_type_register (&_affs0_type);
+	ped_file_system_type_register (&_affs1_type);
+	ped_file_system_type_register (&_affs2_type);
+	ped_file_system_type_register (&_affs3_type);
+	ped_file_system_type_register (&_affs4_type);
+	ped_file_system_type_register (&_affs5_type);
+	ped_file_system_type_register (&_affs6_type);
+	ped_file_system_type_register (&_affs7_type);
+	ped_file_system_type_register (&_amufs_type);
+	ped_file_system_type_register (&_amufs0_type);
+	ped_file_system_type_register (&_amufs1_type);
+	ped_file_system_type_register (&_amufs2_type);
+	ped_file_system_type_register (&_amufs3_type);
+	ped_file_system_type_register (&_amufs4_type);
+	ped_file_system_type_register (&_amufs5_type);
+	ped_file_system_type_register (&_asfs_type);
+	ped_file_system_type_register (&_apfs1_type);
+	ped_file_system_type_register (&_apfs2_type);
+}
+
+void ped_file_system_amiga_done ()
+{
+	ped_file_system_type_unregister (&_affs0_type);
+	ped_file_system_type_unregister (&_affs1_type);
+	ped_file_system_type_unregister (&_affs2_type);
+	ped_file_system_type_unregister (&_affs3_type);
+	ped_file_system_type_unregister (&_affs4_type);
+	ped_file_system_type_unregister (&_affs5_type);
+	ped_file_system_type_unregister (&_affs6_type);
+	ped_file_system_type_unregister (&_affs7_type);
+	ped_file_system_type_unregister (&_amufs_type);
+	ped_file_system_type_unregister (&_amufs0_type);
+	ped_file_system_type_unregister (&_amufs1_type);
+	ped_file_system_type_unregister (&_amufs2_type);
+	ped_file_system_type_unregister (&_amufs3_type);
+	ped_file_system_type_unregister (&_amufs4_type);
+	ped_file_system_type_unregister (&_amufs5_type);
+	ped_file_system_type_unregister (&_asfs_type);
+	ped_file_system_type_unregister (&_apfs1_type);
+	ped_file_system_type_unregister (&_apfs2_type);
+}
diff -Naur parted-1.6.9.orig/libparted/libparted.c parted-1.6.9/libparted/libparted.c
--- parted-1.6.9.orig/libparted/libparted.c	2004-05-10 21:03:19.000000000 +0200
+++ parted-1.6.9/libparted/libparted.c	2004-05-10 21:03:41.000000000 +0200
@@ -86,12 +86,14 @@
 extern void ped_disk_msdos_init ();
 extern void ped_disk_pc98_init ();
 extern void ped_disk_sun_init ();
+extern void ped_disk_amiga_init ();
 
 static void
 init_disk_types ()
 {
 	ped_disk_loop_init ();	/* must be last in the probe list */
 
+	ped_disk_amiga_init ();
 	ped_disk_sun_init ();
 #ifdef ENABLE_PC98
 	ped_disk_pc98_init ();
@@ -104,6 +106,7 @@
 }
 
 #ifdef ENABLE_FS
+extern void ped_file_system_amiga_init (void);
 extern void ped_file_system_xfs_init (void);
 extern void ped_file_system_ufs_init (void);
 extern void ped_file_system_reiserfs_init (void);
@@ -117,6 +120,7 @@
 static void
 init_file_system_types ()
 {
+	ped_file_system_amiga_init ();
 	ped_file_system_xfs_init ();
 	ped_file_system_ufs_init ();
 	ped_file_system_reiserfs_init ();
@@ -137,10 +141,12 @@
 extern void ped_disk_msdos_done ();
 extern void ped_disk_pc98_done ();
 extern void ped_disk_sun_done ();
+extern void ped_disk_amiga_done ();
 
 static void
 done_disk_types ()
 {
+	ped_disk_amiga_done ();
 	ped_disk_sun_done ();
 #ifdef ENABLE_PC98
 	ped_disk_pc98_done ();
@@ -190,6 +196,7 @@
 extern void ped_file_system_reiserfs_done (void);
 extern void ped_file_system_ufs_done (void);
 extern void ped_file_system_xfs_done (void);
+extern void ped_file_system_amiga_done (void);
 
 static void
 done_file_system_types ()
@@ -203,6 +210,7 @@
 	ped_file_system_reiserfs_done ();
 	ped_file_system_ufs_done ();
 	ped_file_system_xfs_done ();
+	ped_file_system_amiga_done ();
 }
 #endif /* ENABLE_FS */