PROGRAM_NAME is defined as a const string "mkfs.ubifs", which won't be
suitable for fsck.ubifs. Add 'program_name' member in ubifs_info
structure, define PROGRAM_NAME as ubifs_info.program_name. Then, error
messages will display right program name if fsck.ubifs is supported.
Besides, add 'program_type' member in ubifs_info structure to identify
which current program type is, without comparing program name.
Signed-off-by: Zhihao Cheng <[email protected]>
---
ubifs-utils/common/crypto.c | 10 +++++++---
ubifs-utils/common/defs.h | 4 ++++
ubifs-utils/common/fscrypt.c | 7 +++++--
ubifs-utils/common/hashtable/hashtable.c | 14 +++++++++-----
ubifs-utils/common/lpt.c | 7 +++++--
ubifs-utils/common/ubifs.h | 6 ++++++
ubifs-utils/mkfs.ubifs/mkfs.ubifs.c | 3 +++
7 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/ubifs-utils/common/crypto.c b/ubifs-utils/common/crypto.c
index 60a67a4e..614a16de 100644
--- a/ubifs-utils/common/crypto.c
+++ b/ubifs-utils/common/crypto.c
@@ -23,10 +23,14 @@
#include <string.h>
#include <assert.h>
-#define PROGRAM_NAME "mkfs.ubifs"
-#include "common.h"
-#include "defs.h"
#include "fscrypt.h"
+#include "defs.h"
+#include "ubifs.h"
+
+/* common.h requires the PROGRAM_NAME macro */
+extern struct ubifs_info info_;
+#define PROGRAM_NAME (info_.program_name)
+#include "common.h"
static int do_hash(const EVP_MD *md, const unsigned char *in, size_t len, unsigned char *out)
{
diff --git a/ubifs-utils/common/defs.h b/ubifs-utils/common/defs.h
index e1aded03..143f6c65 100644
--- a/ubifs-utils/common/defs.h
+++ b/ubifs-utils/common/defs.h
@@ -12,6 +12,10 @@
#include <byteswap.h>
#include <errno.h>
+#define MKFS_PROGRAM_NAME "mkfs.ubifs"
+
+enum { MKFS_PROGRAM_TYPE = 0 };
+
extern int debug_level;
#define dbg_msg(lvl, fmt, ...) do {if (debug_level >= lvl) \
diff --git a/ubifs-utils/common/fscrypt.c b/ubifs-utils/common/fscrypt.c
index 94c6c377..cc989638 100644
--- a/ubifs-utils/common/fscrypt.c
+++ b/ubifs-utils/common/fscrypt.c
@@ -20,11 +20,14 @@
#include <endian.h>
-#define PROGRAM_NAME "mkfs.ubifs"
-#include "common.h"
#include "fscrypt.h"
#include "defs.h"
+#include "ubifs.h"
+/* common.h requires the PROGRAM_NAME macro */
+extern struct ubifs_info info_;
+#define PROGRAM_NAME (info_.program_name)
+#include "common.h"
static __u8 fscrypt_masterkey[FS_MAX_KEY_SIZE];
static struct cipher *fscrypt_cipher;
diff --git a/ubifs-utils/common/hashtable/hashtable.c b/ubifs-utils/common/hashtable/hashtable.c
index c1f99edd..071afd22 100644
--- a/ubifs-utils/common/hashtable/hashtable.c
+++ b/ubifs-utils/common/hashtable/hashtable.c
@@ -1,15 +1,19 @@
/* Copyright (C) 2004 Christopher Clark <[email protected]> */
-#define PROGRAM_NAME "hashtable"
-
-#include "common.h"
-#include "hashtable.h"
-#include "hashtable_private.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <math.h>
+#include "ubifs.h"
+#include "hashtable.h"
+#include "hashtable_private.h"
+
+/* common.h requires the PROGRAM_NAME macro */
+extern struct ubifs_info info_;
+#define PROGRAM_NAME (info_.program_name)
+#include "common.h"
+
/*
Credit for primes table: Aaron Krowne
http://br.endernet.org/~akrowne/
diff --git a/ubifs-utils/common/lpt.c b/ubifs-utils/common/lpt.c
index 23ffe7f7..746fc7db 100644
--- a/ubifs-utils/common/lpt.c
+++ b/ubifs-utils/common/lpt.c
@@ -24,14 +24,17 @@
#include <openssl/evp.h>
#endif
-#define PROGRAM_NAME "mkfs.ubifs"
-#include "common.h"
#include "lpt.h"
#include "defs.h"
#include "ubifs.h"
#include "crc16.h"
#include "sign.h"
+/* common.h requires the PROGRAM_NAME macro */
+extern struct ubifs_info info_;
+#define PROGRAM_NAME (info_.program_name)
+#include "common.h"
+
/**
* do_calc_lpt_geom - calculate sizes for the LPT area.
* @c: the UBIFS file-system description object
diff --git a/ubifs-utils/common/ubifs.h b/ubifs-utils/common/ubifs.h
index 0eef31ac..2b0ffe56 100644
--- a/ubifs-utils/common/ubifs.h
+++ b/ubifs-utils/common/ubifs.h
@@ -273,6 +273,9 @@ struct ubifs_znode
* @highest_inum: highest used inode number
* @max_sqnum: current global sequence number
*
+ * @program_type: used to identify the type of current program
+ * @program_name: program name
+ *
* @jhead_cnt: count of journal heads
* @max_bud_bytes: maximum number of bytes allowed in buds
*
@@ -360,6 +363,9 @@ struct ubifs_info
ino_t highest_inum;
unsigned long long max_sqnum;
+ int program_type;
+ const char *program_name;
+
int jhead_cnt;
long long max_bud_bytes;
diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
index a440bc4b..b4bed018 100644
--- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
+++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
@@ -3056,6 +3056,9 @@ int main(int argc, char *argv[])
{
int err;
+ info_.program_name = MKFS_PROGRAM_NAME;
+ info_.program_type = MKFS_PROGRAM_TYPE;
+
if (crypto_init())
return -1;
--
2.13.6