summaryrefslogtreecommitdiff
path: root/sysutils/dd_rescue/files/patch-dd_rescue.c
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/dd_rescue/files/patch-dd_rescue.c')
-rw-r--r--sysutils/dd_rescue/files/patch-dd_rescue.c22
1 files changed, 15 insertions, 7 deletions
diff --git a/sysutils/dd_rescue/files/patch-dd_rescue.c b/sysutils/dd_rescue/files/patch-dd_rescue.c
index 714b05cc1d54..33263289790e 100644
--- a/sysutils/dd_rescue/files/patch-dd_rescue.c
+++ b/sysutils/dd_rescue/files/patch-dd_rescue.c
@@ -1,6 +1,14 @@
---- dd_rescue.c.orig 2014-01-18 19:02:26.000000000 +0900
-+++ dd_rescue.c 2014-01-18 19:02:39.000000000 +0900
-@@ -1848,7 +1848,9 @@
+--- dd_rescue.c.orig 2014-05-27 17:27:21.000000000 +0900
++++ dd_rescue.c 2014-06-29 01:17:08.000000000 +0900
+@@ -118,6 +118,7 @@
+ #include "list.h"
+ #include "fmt_no.h"
+ #include "find_nonzero.h"
++#include "ffs.h"
+
+ #include "fstrim.h"
+
+@@ -2304,7 +2305,9 @@
const char* retstrdupcat3(const char* dir, char dirsep, const char* inm)
{
@@ -11,13 +19,13 @@
const int dlen = strlen(dir) + (dirsep>0? 1: dirsep);
char* ret = (char*)malloc(dlen + strlen(inm) + 1);
strcpy(ret, dir);
-@@ -1867,7 +1869,9 @@
+@@ -2323,7 +2326,9 @@
{
size_t oln = strlen(onm);
if (!strcmp(onm, ".")) {
-- char* ret = strdup(basename(strdupa(iname)));
-+ char* str = alloca(strlen(iname) + 1);
-+ strcpy(str, iname);
+- char* ret = strdup(basename(strdupa(op->iname)));
++ char* str = alloca(strlen(op->iname) + 1);
++ strcpy(str, op->iname);
+ char* ret = strdup(basename(str));
LISTAPPEND(freenames, ret, charp);
return ret;