mirror of
git://slackware.nl/current.git
synced 2024-12-28 09:59:53 +01:00
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
|
From 5d5e76d369a412bfb3d2cebb5fc0a7509cef878d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Rod Smith <rodsmith@rodsbooks.com>
|
||
|
|
Date: Fri, 15 Apr 2022 18:10:14 -0400
|
||
|
|
Subject: [PATCH] Fix failure & crash of sgdisk when compiled with latest popt
|
||
|
|
(commit 740; presumably eventually release 1.19)
|
||
|
|
|
||
|
|
---
|
||
|
|
gptcl.cc | 2 +-
|
||
|
|
support.h | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/gptcl.cc b/gptcl.cc
|
||
|
|
index 34c9421..0d578eb 100644
|
||
|
|
--- a/gptcl.cc
|
||
|
|
+++ b/gptcl.cc
|
||
|
|
@@ -155,7 +155,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) {
|
||
|
|
} // while
|
||
|
|
|
||
|
|
// Assume first non-option argument is the device filename....
|
||
|
|
- device = (char*) poptGetArg(poptCon);
|
||
|
|
+ device = strdup((char*) poptGetArg(poptCon));
|
||
|
|
poptResetContext(poptCon);
|
||
|
|
|
||
|
|
if (device != NULL) {
|
||
|
|
diff --git a/support.h b/support.h
|
||
|
|
index 8ba9ad1..f91f1bc 100644
|
||
|
|
--- a/support.h
|
||
|
|
+++ b/support.h
|
||
|
|
@@ -8,7 +8,7 @@
|
||
|
|
#include <stdlib.h>
|
||
|
|
#include <string>
|
||
|
|
|
||
|
|
-#define GPTFDISK_VERSION "1.0.9"
|
||
|
|
+#define GPTFDISK_VERSION "1.0.9.1"
|
||
|
|
|
||
|
|
#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__)
|
||
|
|
// Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64
|