From b270f76ed82f30e26f75804d0b4602d42caaf369 Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Thu, 4 Oct 2018 11:39:25 +0200
Subject: [PATCH] Corrected --zero-terminated handling
---
sha512toc.c | 11 +----------
sha512toc.h | 2 +-
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/sha512toc.c b/sha512toc.c
index 7aa7887..5dd9290 100644
--- a/sha512toc.c
+++ b/sha512toc.c
@@ -38,15 +38,6 @@
#define XATTR_sha512SUM "trusted.sha512sum.control.lth.se"
-/*
-#define FLAGS_READ_XATTR 0x01
-#define FLAGS_WRITE_XATTR 0x02
-#define FLAGS_CLEAR_XATTR 0x04
-#define FLAGS_MAX_AGE 0x08
-#define FLAGS_VERBOSE 0x10
-#define FLAGS_NUL_TERMINATED 0x20
-*/
-
struct options {
int flags;
time_t max_age;
@@ -319,7 +310,7 @@ int main(int argc, char *argv[])
while (1) {
int v, i = 0;
- v = getopt_long(argc, argv, "hxrwcm:v", long_options, &i);
+ v = getopt_long(argc, argv, "hxrwcm:vz", long_options, &i);
if (v == -1) break;
switch (v) {
case 'h':
diff --git a/sha512toc.h b/sha512toc.h
index 5f572cf..fc5ea9b 100644
--- a/sha512toc.h
+++ b/sha512toc.h
@@ -4,7 +4,7 @@ enum {
FLAGS_CLEAR_XATTR=0x0004,
FLAGS_MAX_AGE=0x0008,
FLAGS_NO_CALC_HASH=0x0010,
- FLAGS_NUL_TERMINATED=0x00,
+ FLAGS_NUL_TERMINATED=0x20,
FLAGS_VERBOSE_MASK=0xc000,
FLAGS_VERBOSE0=0x0000,
FLAGS_VERBOSE1=0x4000,
--
GitLab