Rename tools to not collide with squashfs-tools

This commit changes the names of the tools to gensquashfs and rdsquashfs
so they don't collide with the names used by the squashfs-tools package
and the two can be installed side by side.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

15 files changed, 32 insertions, 32 deletions

diff --git a/.gitignore b/.gitignore
index 944a414..2d67338 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,5 +18,5 @@ config.h
 *.o
 *.a
 *~
-mksquashfs
-unsquashfs
+gensquashfs
+rdsquashfs
diff --git a/mkfs/Makemodule.am b/mkfs/Makemodule.am
index 3914e71..5af5ad5 100644
--- a/mkfs/Makemodule.am
+++ b/mkfs/Makemodule.am
@@ -1,13 +1,13 @@
-mksquashfs_SOURCES = mkfs/mksquashfs.c mkfs/mksquashfs.h mkfs/block.c
-mksquashfs_SOURCES += mkfs/options.c mkfs/meta.c
-mksquashfs_LDADD = libsquashfs.a libfstree.a libcompress.a libutil.a
+gensquashfs_SOURCES = mkfs/mkfs.c mkfs/mkfs.h mkfs/block.c
+gensquashfs_SOURCES += mkfs/options.c mkfs/meta.c
+gensquashfs_LDADD = libsquashfs.a libfstree.a libcompress.a libutil.a
 
 if WITH_XZ
-mksquashfs_LDADD += $(XZ_LIBS)
+gensquashfs_LDADD += $(XZ_LIBS)
 endif
 
 if WITH_GZIP
-mksquashfs_LDADD += $(ZLIB_LIBS)
+gensquashfs_LDADD += $(ZLIB_LIBS)
 endif
 
-bin_PROGRAMS += mksquashfs
+bin_PROGRAMS += gensquashfs
diff --git a/mkfs/block.c b/mkfs/block.c
index 3472346..76b261d 100644
--- a/mkfs/block.c
+++ b/mkfs/block.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
-#include "mksquashfs.h"
+#include "mkfs.h"
 #include "util.h"
 
 static int write_block(file_info_t *fi, sqfs_info_t *info)
diff --git a/mkfs/meta.c b/mkfs/meta.c
index c48aec3..f7de5c6 100644
--- a/mkfs/meta.c
+++ b/mkfs/meta.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
 #include "meta_writer.h"
-#include "mksquashfs.h"
+#include "mkfs.h"
 #include "util.h"
 
 #include <assert.h>
diff --git a/mkfs/mksquashfs.c b/mkfs/mkfs.c
index 2f2e508..d708d37 100644
--- a/mkfs/mksquashfs.c
+++ b/mkfs/mkfs.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
-#include "mksquashfs.h"
+#include "mkfs.h"
 #include "util.h"
 
 static int padd_file(sqfs_info_t *info)
diff --git a/mkfs/mksquashfs.h b/mkfs/mkfs.h
index 106822c..8a867f2 100644
--- a/mkfs/mksquashfs.h
+++ b/mkfs/mkfs.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
-#ifndef MKSQUASHFS_H
-#define MKSQUASHFS_H
+#ifndef MKFS_H
+#define MKFS_H
 
 #include "squashfs.h"
 #include "compress.h"
@@ -58,4 +58,4 @@ int write_data_to_image(sqfs_info_t *info);
 
 int sqfs_write_inodes(sqfs_info_t *info);
 
-#endif /* MKSQUASHFS_H */
+#endif /* MKFS_H */
diff --git a/mkfs/options.c b/mkfs/options.c
index f1fe192..4d49a9b 100644
--- a/mkfs/options.c
+++ b/mkfs/options.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
-#include "mksquashfs.h"
+#include "mkfs.h"
 #include "util.h"
 
 #include <stdlib.h>
diff --git a/unpack/Makemodule.am b/unpack/Makemodule.am
index ccb5707..6a0eab0 100644
--- a/unpack/Makemodule.am
+++ b/unpack/Makemodule.am
@@ -1,15 +1,15 @@
-unsquashfs_SOURCES = unpack/unsquashfs.c unpack/tree_node_from_inode.c
-unsquashfs_SOURCES += unpack/unsquashfs.h unpack/read_fstree.c
-unsquashfs_SOURCES += unpack/list_files.c unpack/extract_file.c
-unsquashfs_SOURCES += unpack/restore_fstree.c
-unsquashfs_LDADD = libsquashfs.a libfstree.a libcompress.a libutil.a
+rdsquashfs_SOURCES = unpack/rdsquashfs.c unpack/tree_node_from_inode.c
+rdsquashfs_SOURCES += unpack/rdsquashfs.h unpack/read_fstree.c
+rdsquashfs_SOURCES += unpack/list_files.c unpack/extract_file.c
+rdsquashfs_SOURCES += unpack/restore_fstree.c
+rdsquashfs_LDADD = libsquashfs.a libfstree.a libcompress.a libutil.a
 
 if WITH_XZ
-unsquashfs_LDADD += $(XZ_LIBS)
+rdsquashfs_LDADD += $(XZ_LIBS)
 endif
 
 if WITH_GZIP
-unsquashfs_LDADD += $(ZLIB_LIBS)
+rdsquashfs_LDADD += $(ZLIB_LIBS)
 endif
 
-bin_PROGRAMS += unsquashfs
+bin_PROGRAMS += rdsquashfs
diff --git a/unpack/extract_file.c b/unpack/extract_file.c
index 368f6d7..0e62f75 100644
--- a/unpack/extract_file.c
+++ b/unpack/extract_file.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
-#include "unsquashfs.h"
+#include "rdsquashfs.h"
 
 int extract_file(file_info_t *fi, compressor_t *cmp, size_t block_size,
 		 frag_reader_t *frag, int sqfsfd, int outfd)
diff --git a/unpack/list_files.c b/unpack/list_files.c
index 86bc185..b9bb161 100644
--- a/unpack/list_files.c
+++ b/unpack/list_files.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
-#include "unsquashfs.h"
+#include "rdsquashfs.h"
 
 #include <sys/sysmacros.h>
 
diff --git a/unpack/unsquashfs.c b/unpack/rdsquashfs.c
index 8ec1b94..ec14e0e 100644
--- a/unpack/unsquashfs.c
+++ b/unpack/rdsquashfs.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
-#include "unsquashfs.h"
+#include "rdsquashfs.h"
 
 enum {
 	OP_NONE = 0,
diff --git a/unpack/unsquashfs.h b/unpack/rdsquashfs.h
index a8784fc..995eee7 100644
--- a/unpack/unsquashfs.h
+++ b/unpack/rdsquashfs.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
-#ifndef UNSQUASHFS_H
-#define UNSQUASHFS_H
+#ifndef RDSQUASHFS_H
+#define RDSQUASHFS_H
 
 #include "meta_reader.h"
 #include "frag_reader.h"
@@ -46,4 +46,4 @@ int restore_fstree(const char *rootdir, tree_node_t *root, compressor_t *cmp,
 		   size_t block_size, frag_reader_t *frag, int sqfsfd,
 		   int flags);
 
-#endif /* UNSQUASHFS_H */
+#endif /* RDSQUASHFS_H */
diff --git a/unpack/read_fstree.c b/unpack/read_fstree.c
index f200243..0b75d8b 100644
--- a/unpack/read_fstree.c
+++ b/unpack/read_fstree.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
-#include "unsquashfs.h"
+#include "rdsquashfs.h"
 
 
 static int should_skip(int type, int flags)
diff --git a/unpack/restore_fstree.c b/unpack/restore_fstree.c
index 8ef21c3..5a20c5f 100644
--- a/unpack/restore_fstree.c
+++ b/unpack/restore_fstree.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
-#include "unsquashfs.h"
+#include "rdsquashfs.h"
 
 static int restore_directory(int dirfd, tree_node_t *n, compressor_t *cmp,
 			     size_t block_size, frag_reader_t *frag,
diff --git a/unpack/tree_node_from_inode.c b/unpack/tree_node_from_inode.c
index 95056a7..2e720d3 100644
--- a/unpack/tree_node_from_inode.c
+++ b/unpack/tree_node_from_inode.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
-#include "unsquashfs.h"
+#include "rdsquashfs.h"
 
 static size_t compute_size(sqfs_inode_generic_t *inode, const char *name,
 			   size_t block_size)