udf{info,label,tune}: Migrate common code into {read,update}disc.[ch]

Author: jtru

udfinfo/main.c

@@ -38,52 +38,6 @@
 #include "options.h"
 #include "readdisc.h"
 
-static uint64_t get_size(int fd)
-{
-	struct stat st;
-	uint64_t size;
-	off_t offset;
-
-	if (fstat(fd, &st) == 0)
-	{
-		if (S_ISBLK(st.st_mode) && ioctl(fd, BLKGETSIZE64, &size) == 0)
-			return size;
-		else if (S_ISREG(st.st_mode))
-			return st.st_size;
-	}
-
-	offset = lseek(fd, 0, SEEK_END);
-	if (offset == (off_t)-1)
-	{
-		fprintf(stderr, "%s: Error: Cannot detect size of disk: %s\n", appname, strerror(errno));
-		exit(1);
-	}
-
-	if (lseek(fd, 0, SEEK_SET) != 0)
-	{
-		fprintf(stderr, "%s: Error: Cannot seek to start of disk: %s\n", appname, strerror(errno));
-		exit(1);
-	}
-
-	return offset;
-}
-
-static int get_sector_size(int fd)
-{
-	int size;
-
-	if (ioctl(fd, BLKSSZGET, &size) != 0)
-		return 0;
-
-	if (size < 512 || size > 32768 || (size & (size - 1)))
-	{
-		fprintf(stderr, "%s: Warning: Disk logical sector size (%d) is not suitable for UDF\n", appname, size);
-		return 0;
-	}
-
-	return size;
-}
-
 static uint32_t compute_windows_serial_num(struct udf_disc *disc)
 {
 	uint8_t *buffer = (uint8_t *)disc->udf_fsd;

udfinfo/readdisc.c

@@ -2398,3 +2398,49 @@ int read_disc(int fd, struct udf_disc *disc)
 
 	return 0;
 }
+
+uint64_t get_size(int fd)
+{
+	struct stat st;
+	uint64_t size;
+	off_t offset;
+
+	if (fstat(fd, &st) == 0)
+	{
+		if (S_ISBLK(st.st_mode) && ioctl(fd, BLKGETSIZE64, &size) == 0)
+			return size;
+		else if (S_ISREG(st.st_mode))
+			return st.st_size;
+	}
+
+	offset = lseek(fd, 0, SEEK_END);
+	if (offset == (off_t)-1)
+	{
+		fprintf(stderr, "%s: Error: Cannot detect size of disk: %s\n", appname, strerror(errno));
+		exit(1);
+	}
+
+	if (lseek(fd, 0, SEEK_SET) != 0)
+	{
+		fprintf(stderr, "%s: Error: Cannot seek to start of disk: %s\n", appname, strerror(errno));
+		exit(1);
+	}
+
+	return offset;
+}
+
+int get_sector_size(int fd)
+{
+	int size;
+
+	if (ioctl(fd, BLKSSZGET, &size) != 0)
+		return 0;
+
+	if (size < 512 || size > 32768 || (size & (size - 1)))
+	{
+		fprintf(stderr, "%s: Warning: Disk logical sector size (%d) is not suitable for UDF\n", appname, size);
+		return 0;
+	}
+
+	return size;
+}

udfinfo/readdisc.h

@@ -19,8 +19,12 @@
 #ifndef READDISC_H
 #define READDISC_H
 
+#include <linux/fs.h>
+
 struct udf_disc;
 
+uint64_t get_size(int);
+int get_sector_size(int);
 int read_disc(int, struct udf_disc *);
 
 #endif /* READDISC_H */

udflabel/Makefile.am

@@ -1,4 +1,4 @@
 sbin_PROGRAMS = udflabel
 udflabel_LDADD = $(top_builddir)/libudffs/libudffs.la
-udflabel_SOURCES = main.c options.c ../udfinfo/readdisc.c options.h ../udfinfo/readdisc.h ../include/ecma_167.h ../include/osta_udf.h ../include/libudffs.h ../include/bswap.h
+udflabel_SOURCES = main.c options.c ../udfinfo/readdisc.c ../udftune/updatedisc.c options.h ../udftune/updatedisc.h ../udfinfo/readdisc.h ../include/ecma_167.h ../include/osta_udf.h ../include/libudffs.h ../include/bswap.h
 AM_CPPFLAGS = -I$(top_srcdir)/include