# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1558739961 -7200
# Node ID 4135f638972c09ec8e20ef9955c8eea790901a52
# Parent  2b586f8b40179f7894ecabb9fc9ca93d67b38a68
Moved common routines into a separate file.

diff -r 2b586f8b4017 -r 4135f638972c makesd-common
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/makesd-common	Sat May 25 01:19:21 2019 +0200
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# Common routines.
+
+# Test for a selected device.
+
+check_device()
+{
+    if [ ! "$DEV" ] ; then
+        cat 1>&2 <<EOF
+No device specified. Use the DEV environment variable to indicate a device.
+EOF
+        exit 1
+    fi
+
+    if [ ! -e "$DEV" ] ; then
+        cat 1>&2 <<EOF
+Device not found: $DEV
+EOF
+        exit 1
+    fi
+}
+
+# Process partition field values in summary tables.
+
+read_fields()
+{
+    OLDIFS=$IFS
+    IFS=`echo -n '\t'` read START SIZE TYPE
+    STATUS=$?
+    IFS=$OLDIFS
+    return $STATUS
+}
diff -r 2b586f8b4017 -r 4135f638972c makesd-partition
--- a/makesd-partition	Fri May 24 23:17:38 2019 +0200
+++ b/makesd-partition	Sat May 25 01:19:21 2019 +0200
@@ -10,11 +10,14 @@
 PROGNAME=`basename "$0"`
 THISDIR=`dirname "$0"`
 
+COMMON="$THISDIR/makesd-common"
 EXPAND="$THISDIR/makesd-expand-def"
 PARTSUMMARY="$THISDIR/makesd-partition-summary"
 PARTTABLE="$THISDIR/makesd-partition-table"
 SFDISK="/sbin/sfdisk"
 
+. "$COMMON"
+
 
 
 # Test sfdisk behaviour and obtain useful information.
@@ -32,19 +35,7 @@
 
 # Obtain details of the selected device.
 
-if [ ! "$DEV" ] ; then
-    cat 1>&2 <<EOF
-No device specified. Use the DEV environment variable to indicate a device.
-EOF
-    exit 1
-fi
-
-if [ ! -e "$DEV" ] ; then
-    cat 1>&2 <<EOF
-Device not found: $DEV
-EOF
-    exit 1
-fi
+check_device
 
 # Test for the cylinder alignment option.
 
diff -r 2b586f8b4017 -r 4135f638972c makesd-partition-table
--- a/makesd-partition-table	Fri May 24 23:17:38 2019 +0200
+++ b/makesd-partition-table	Sat May 25 01:19:21 2019 +0200
@@ -6,8 +6,11 @@
 PROGNAME=`basename "$0"`
 THISDIR=`dirname "$0"`
 
+COMMON="$THISDIR/makesd-common"
 SFDISK="/sbin/sfdisk"
 
+. "$COMMON"
+
 
 
 # Cylinder size in sectors for alignment purposes.
@@ -119,10 +122,10 @@
 partition_type()
 {
     case "$1" in
-        ( ext[2-4]? ) echo "0x83" ;;
-        ( swap      ) echo "0x82" ;;
-        ( fat       ) echo "0x0c" ;;
-        ( *         ) echo "0x83" ;;
+        ( ext* ) echo "0x83" ;;
+        ( swap ) echo "0x82" ;;
+        ( fat  ) echo "0x0c" ;;
+        ( *    ) echo "0x83" ;;
     esac
 }
 
@@ -175,19 +178,6 @@
 
 
 
-# Process the arguments, building a partition description.
-
-read_fields()
-{
-    OLDIFS=$IFS
-    IFS=`echo -n '\t'` read START SIZE TYPE
-    STATUS=$?
-    IFS=$OLDIFS
-    return $STATUS
-}
-
-
-
 # Emit the help message if requested.
 
 if [ "$1" = '--help' ] ; then
@@ -224,19 +214,7 @@
 
 # Obtain details of the selected device.
 
-if [ ! "$DEV" ] ; then
-    cat 1>&2 <<EOF
-No device specified. Use the DEV environment variable to indicate a device.
-EOF
-    exit 1
-fi
-
-if [ ! -e "$DEV" ] ; then
-    cat 1>&2 <<EOF
-Device not found: $DEV
-EOF
-    exit 1
-fi
+check_device
 
 # Initialise sfdisk usage.