[PATCH 1/5] Include fcntl.h for O_EXCL

[PATCH 1/5] Include fcntl.h for O_EXCL

[Khem Raj]

Fix
error: 'O_CREAT' undeclared (first use in this function)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 invutil/invidx.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/invutil/invidx.c b/invutil/invidx.c
index 67efdf7..325a9a1 100644
--- a/invutil/invidx.c
+++ b/invutil/invidx.c
@@ -27,6 +27,7 @@
 #include <sys/stat.h>
 #include <string.h>
 #include <uuid/uuid.h>
+#include <fcntl.h>
 
 #include "types.h"
 #include "mlog.h"
-- 
2.14.1

[PATCH 2/5] xfsdump: Use c99 defined [u]int*_t instead of double underscore integer types

[Khem Raj]

Purely a mechanical change

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 common/content_inode.h | 4 ++--
 common/hsmapi.c        | 2 +-
 doc/xfsdump.html       | 8 ++++----
 inventory/inv_oref.h   | 2 +-
 inventory/inv_priv.h   | 4 ++--
 inventory/inventory.h  | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/content_inode.h b/common/content_inode.h
index a69a9a0..6936e05 100644
--- a/common/content_inode.h
+++ b/common/content_inode.h
@@ -191,10 +191,10 @@ typedef struct bstat bstat_t;
  * and using two 16bit values to hold new 32bit projid was choosen
  * to retain compatibility with "old" filesystems).
  */
-static inline __uint32_t
+static inline uint32_t
 bstat_projid(struct bstat *bs)
 {
-        return (__uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo;
+        return (uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo;
 }
 
 
diff --git a/common/hsmapi.c b/common/hsmapi.c
index 6054773..0709dbe 100644
--- a/common/hsmapi.c
+++ b/common/hsmapi.c
@@ -585,7 +585,7 @@ HsmModifyExtentMap(
 	struct getbmapx	*bmap)
 {
 	dmf_f_ctxt_t	*dmf_f_ctxtp = (dmf_f_ctxt_t *)contextp;
-	__int64_t	length;
+	int64_t		length;
 
 	if (bmap[0].bmv_entries <= 0) {
 		return 1;	/* caller must already be at EOF */
diff --git a/doc/xfsdump.html b/doc/xfsdump.html
index 9c6722e..8cc02d4 100644
--- a/doc/xfsdump.html
+++ b/doc/xfsdump.html
@@ -1935,7 +1935,7 @@ The files are constructed like so:
 <pre>
 typedef struct invt_counter {
     INVT_COUNTER_FIELDS
-        __uint32_t    ic_vernum;/* on disk version number for posterity */\
+        uint32_t      ic_vernum;/* on disk version number for posterity */\
         u_int         ic_curnum;/* number of sessions/invindices recorded \
                                    so far */                              \
         u_int         ic_maxnum;/* maximum number of sessions/inv_indices \
@@ -1975,7 +1975,7 @@ typedef struct invt_fstab {
 <pre>
 typedef struct invt_counter {
     INVT_COUNTER_FIELDS
-        __uint32_t    ic_vernum;/* on disk version number for posterity */\
+        uint32_t      ic_vernum;/* on disk version number for posterity */\
         u_int         ic_curnum;/* number of sessions/invindices recorded \
                                    so far */                              \
         u_int         ic_maxnum;/* maximum number of sessions/inv_indices \
@@ -2012,7 +2012,7 @@ typedef struct invt_entry {
 <pre>
 typedef struct invt_sescounter {
     INVT_COUNTER_FIELDS
-        __uint32_t    ic_vernum;/* on disk version number for posterity */\
+        uint32_t      ic_vernum;/* on disk version number for posterity */\
         u_int         ic_curnum;/* number of sessions/invindices recorded \
                                    so far */                              \
         u_int         ic_maxnum;/* maximum number of sessions/inv_indices \
@@ -2034,7 +2034,7 @@ typedef struct invt_seshdr {
     off64_t    sh_streams_off; /* offset to start of the set of
                                   stream hdrs */
     time_t     sh_time;        /* time of the dump */
-    __uint32_t sh_flag;        /* for misc flags */
+    uint32_t   sh_flag;        /* for misc flags */
     u_char     sh_level;       /* dump level */
     u_char     sh_pruned;      /* pruned by invutil flag */
     char       sh_padding[22];
diff --git a/inventory/inv_oref.h b/inventory/inv_oref.h
index e16684d..38303a4 100644
--- a/inventory/inv_oref.h
+++ b/inventory/inv_oref.h
@@ -46,7 +46,7 @@
 
 
 
-typedef __uint32_t	invt_objtype_t;
+typedef uint32_t	invt_objtype_t;
 
 #define INVT_LOCKED		0x0001
 
diff --git a/inventory/inv_priv.h b/inventory/inv_priv.h
index aa94a33..5f2256d 100644
--- a/inventory/inv_priv.h
+++ b/inventory/inv_priv.h
@@ -120,7 +120,7 @@ typedef struct invt_seshdr {
 	off64_t		sh_streams_off; /* offset to start of the set of 
 					   stream hdrs */
 	time32_t	sh_time;        /* time of the dump */
-	__uint32_t	sh_flag;        /* for misc flags */
+	uint32_t	sh_flag;        /* for misc flags */
 	u_char		sh_level;       /* dump level */
 	u_char		sh_pruned;      /* pruned by invutil flag */
 	char		sh_padding[22];
@@ -184,7 +184,7 @@ typedef struct invt_entry {
 
 /* Cheap Inheritance, and an attempt to avoid a nested type */
 #define INVT_COUNTER_FIELDS  \
-        __uint32_t    ic_vernum;/* on disk version number for posterity */\
+        uint32_t      ic_vernum;/* on disk version number for posterity */\
 	uint	      ic_curnum;/* number of sessions/invindices recorded \
 				   so far */				  \
 	uint	      ic_maxnum;/* maximum number of sessions/inv_indices \
diff --git a/inventory/inventory.h b/inventory/inventory.h
index 134b9ba..c1d7403 100644
--- a/inventory/inventory.h
+++ b/inventory/inventory.h
@@ -43,7 +43,7 @@
 /* length of labels, mntpts, etc */
 #define INV_STRLEN              GLOBAL_HDR_STRING_SZ
 
-typedef __uint32_t		inv_version_t;
+typedef uint32_t		inv_version_t;
 
 /* This is the general inventory version. 
  */
-- 
2.14.1

[PATCH 3/5] replace use of SIGCLD with SIGCHLD

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 common/main.c    | 2 +-
 doc/xfsdump.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/main.c b/common/main.c
index b34e974..49dd361 100644
--- a/common/main.c
+++ b/common/main.c
@@ -2237,7 +2237,7 @@ static sig_printmap_t sig_printmap[ ] = {
 	{SIGTERM,	"SIGTERM"},
 	{SIGUSR1,	"SIGUSR1"},
 	{SIGUSR2,	"SIGUSR2"},
-	{SIGCLD,	"SIGCLD"},
+	{SIGCHLD,	"SIGCHLD"},
 	{SIGPWR,	"SIGPWR"},
 	{SIGURG,	"SIGURG"},
 	{SIGPOLL,	"SIGPOLL"},
diff --git a/doc/xfsdump.html b/doc/xfsdump.html
index 8cc02d4..9399bd6 100644
--- a/doc/xfsdump.html
+++ b/doc/xfsdump.html
@@ -334,7 +334,7 @@ the ring buffer. It ignores signals and does not terminate until it
 receives a RING_OP_DIE message. It then exits 0.
 <p>
 The main process sleeps waiting for any of its children to die
-(ie. waiting for a SIGCLD). All children that it cares about (stream
+(ie. waiting for a SIGCHLD). All children that it cares about (stream
 managers and ring buffer slaves) are registered through the child
 manager abstraction. When a child dies wait status and other info is
 stored with its entry in the child manager. main() ignores the deaths
-- 
2.14.1

[PATCH 4/5] include limit.h for PATH_MAX

[Khem Raj]

fixed
var.c:42:12: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'RAND_MAX'?
  char path[PATH_MAX];`

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 dump/var.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dump/var.c b/dump/var.c
index 645caab..8156d37 100644
--- a/dump/var.c
+++ b/dump/var.c
@@ -16,6 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <limits.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/stat.h>
-- 
2.14.1

[PATCH 5/5] include sys/types.h for u_int32_t in attr/attributes.h

[Khem Raj]

error: unknown type name 'u_int32_t'

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 restore/content.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/restore/content.c b/restore/content.c
index 7c4a81f..1d5de1b 100644
--- a/restore/content.c
+++ b/restore/content.c
@@ -24,6 +24,7 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
+#include <sys/types.h>
 #include <attr/attributes.h>
 #include <xfs/handle.h>
 #include <time.h>
-- 
2.14.1

Re: [PATCH 1/5] Include fcntl.h for O_EXCL

[Eric Sandeen]

Hm, in looking over these, I see that Felix Janda
already sent patches to fix all this back in Jan 2016;
[PATCH 0/6] xfsdump: Compile with musl libc

That was around the time of a maintainer handoff, and
it looks like they go lost.  Since Felix did the original
work, and those patches are already reviewed, I
think I'll pick them up to solve your issues.  Thanks for the
reminder though; unfortunately I /just/ released a new xfsdump
version, but this is probably reason enough to do a fresh release
so you (and Felix) can stop carrying patches.

In Felix's patches as well as in yours, the changelogs could
be improved a bit to say /why/ the changes are being made,
i.e. to support musl, which is more pedantic.  I'll add that
info on commit.

Thanks,
-Eric

On 9/9/17 7:30 PM, Khem Raj wrote:
> Fix
> error: 'O_CREAT' undeclared (first use in this function)
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  invutil/invidx.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/invutil/invidx.c b/invutil/invidx.c
> index 67efdf7..325a9a1 100644
> --- a/invutil/invidx.c
> +++ b/invutil/invidx.c
> @@ -27,6 +27,7 @@
>  #include <sys/stat.h>
>  #include <string.h>
>  #include <uuid/uuid.h>
> +#include <fcntl.h>
>  
>  #include "types.h"
>  #include "mlog.h"
> 

Re: [PATCH 1/5] Include fcntl.h for O_EXCL

[Khem Raj]

On Sun, Sep 10, 2017 at 9:30 AM, Eric Sandeen <sandeen@sandeen.net> wrote:
> Hm, in looking over these, I see that Felix Janda
> already sent patches to fix all this back in Jan 2016;
> [PATCH 0/6] xfsdump: Compile with musl libc
>
> That was around the time of a maintainer handoff, and
> it looks like they go lost.  Since Felix did the original
> work, and those patches are already reviewed, I
> think I'll pick them up to solve your issues.  Thanks for the
> reminder though; unfortunately I /just/ released a new xfsdump
> version, but this is probably reason enough to do a fresh release
> so you (and Felix) can stop carrying patches.

Cool. Thanks

>
> In Felix's patches as well as in yours, the changelogs could
> be improved a bit to say /why/ the changes are being made,
> i.e. to support musl, which is more pedantic.  I'll add that
> info on commit.

OK. Thanks.

>
> Thanks,
> -Eric
>
> On 9/9/17 7:30 PM, Khem Raj wrote:
>> Fix
>> error: 'O_CREAT' undeclared (first use in this function)
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  invutil/invidx.c | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/invutil/invidx.c b/invutil/invidx.c
>> index 67efdf7..325a9a1 100644
>> --- a/invutil/invidx.c
>> +++ b/invutil/invidx.c
>> @@ -27,6 +27,7 @@
>>  #include <sys/stat.h>
>>  #include <string.h>
>>  #include <uuid/uuid.h>
>> +#include <fcntl.h>
>>
>>  #include "types.h"
>>  #include "mlog.h"
>>