Rebase against 9b6d198a3c7c8a02aa69c0d3d11829712e9778a6.

This commit is contained in:
Zebediah Figura
2019-04-24 23:17:29 -05:00
parent 4969e2759b
commit f61fe9f16b
14 changed files with 211 additions and 632 deletions

View File

@@ -1,25 +1,27 @@
From e78ec7f2036c1bdf46d4ecc7db1574847ca7f54f Mon Sep 17 00:00:00 2001
From 7edfe7dd563c746ab2eb896b36dc9f6cafb13a91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 1 Apr 2016 01:29:51 +0200
Subject: [PATCH] fsutil: Add fsutil program with support for creating hard
links.
---
programs/fsutil/Makefile.in | 3 +
programs/fsutil/fsutil.rc | 34 ++++++++++++
programs/fsutil/main.c | 131 ++++++++++++++++++++++++++++++++++++++++++--
programs/fsutil/resources.h | 25 +++++++++
4 files changed, 187 insertions(+), 6 deletions(-)
programs/fsutil/Makefile.in | 5 +-
programs/fsutil/fsutil.rc | 34 ++++++++++
programs/fsutil/main.c | 131 ++++++++++++++++++++++++++++++++++--
programs/fsutil/resources.h | 25 +++++++
4 files changed, 188 insertions(+), 7 deletions(-)
create mode 100644 programs/fsutil/fsutil.rc
create mode 100644 programs/fsutil/resources.h
diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in
index f339c4c..7433695 100644
index 64307e83a..1cc7f87e2 100644
--- a/programs/fsutil/Makefile.in
+++ b/programs/fsutil/Makefile.in
@@ -1,5 +1,8 @@
@@ -1,6 +1,9 @@
MODULE = fsutil.exe
APPMODE = -mconsole -municode
-EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
+EXTRADLLFLAGS = -mconsole -municode
+IMPORTS = user32
C_SRCS = \
@@ -28,7 +30,7 @@ index f339c4c..7433695 100644
+RC_SRCS = fsutil.rc
diff --git a/programs/fsutil/fsutil.rc b/programs/fsutil/fsutil.rc
new file mode 100644
index 0000000..593f817
index 000000000..593f8175a
--- /dev/null
+++ b/programs/fsutil/fsutil.rc
@@ -0,0 +1,34 @@
@@ -67,7 +69,7 @@ index 0000000..593f817
+ STRING_HARDLINK_CREATE_USAGE, "Syntax: fsutil hardlink create old new\n\n"
+}
diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c
index 2bce87e..5084196 100644
index 2bce87edc..508419682 100644
--- a/programs/fsutil/main.c
+++ b/programs/fsutil/main.c
@@ -1,5 +1,6 @@
@@ -222,7 +224,7 @@ index 2bce87e..5084196 100644
}
diff --git a/programs/fsutil/resources.h b/programs/fsutil/resources.h
new file mode 100644
index 0000000..b85826a
index 000000000..b85826ac4
--- /dev/null
+++ b/programs/fsutil/resources.h
@@ -0,0 +1,25 @@
@@ -252,5 +254,5 @@ index 0000000..b85826a
+#define STRING_HARDLINK_USAGE 104
+#define STRING_HARDLINK_CREATE_USAGE 105
--
2.7.4
2.21.0