|
|
17ee557 |
diff --git a/doc/sed.1 b/doc/sed.1
|
|
|
17ee557 |
index 42a0a28..bb235c8 100644
|
|
|
17ee557 |
--- a/doc/sed.1
|
|
|
17ee557 |
+++ b/doc/sed.1
|
|
|
17ee557 |
@@ -1,5 +1,5 @@
|
|
|
17ee557 |
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.28.
|
|
|
17ee557 |
-.TH SED "1" "June 2009" "sed version 4.2.1" "User Commands"
|
|
|
17ee557 |
+.TH SED "1" "February 2010" "sed version 4.2.1" "User Commands"
|
|
|
17ee557 |
.SH NAME
|
|
|
17ee557 |
sed \- stream editor for filtering and transforming text
|
|
|
17ee557 |
.SH SYNOPSIS
|
|
|
17ee557 |
@@ -40,6 +40,10 @@ follow symlinks when processing in place
|
|
|
17ee557 |
.IP
|
|
|
17ee557 |
edit files in place (makes backup if extension supplied)
|
|
|
17ee557 |
.HP
|
|
|
17ee557 |
+\fB\-c\fR, \fB\-\-copy\fR
|
|
|
17ee557 |
+.IP
|
|
|
17ee557 |
+use copy instead of rename when shuffling files in \fB\-i\fR mode
|
|
|
17ee557 |
+.HP
|
|
|
17ee557 |
\fB\-l\fR N, \fB\-\-line\-length\fR=\fIN\fR
|
|
|
17ee557 |
.IP
|
|
|
17ee557 |
specify the desired line-wrap length for the `l' command
|
|
|
17ee557 |
diff --git a/sed/execute.c b/sed/execute.c
|
|
|
17ee557 |
index af8c4d2..c05b418 100644
|
|
|
17ee557 |
--- a/sed/execute.c
|
|
|
17ee557 |
+++ b/sed/execute.c
|
|
|
17ee557 |
@@ -822,11 +822,13 @@ closedown(input)
|
|
|
17ee557 |
if (strcmp(in_place_extension, "*") != 0)
|
|
|
17ee557 |
{
|
|
|
17ee557 |
char *backup_file_name = get_backup_file_name(target_name);
|
|
|
17ee557 |
- ck_rename (target_name, backup_file_name, input->out_file_name);
|
|
|
17ee557 |
+ (copy_instead_of_rename?ck_fcmove:ck_rename)
|
|
|
17ee557 |
+ (target_name, backup_file_name, input->out_file_name);
|
|
|
17ee557 |
free (backup_file_name);
|
|
|
17ee557 |
}
|
|
|
17ee557 |
|
|
|
17ee557 |
- ck_rename (input->out_file_name, target_name, input->out_file_name);
|
|
|
17ee557 |
+ (copy_instead_of_rename?ck_fcmove:ck_rename)
|
|
|
17ee557 |
+ (input->out_file_name, target_name, input->out_file_name);
|
|
|
17ee557 |
free (input->out_file_name);
|
|
|
17ee557 |
}
|
|
|
17ee557 |
else
|
|
|
17ee557 |
diff --git a/sed/sed.c b/sed/sed.c
|
|
|
17ee557 |
index 723958d..1fbb279 100644
|
|
|
17ee557 |
--- a/sed/sed.c
|
|
|
17ee557 |
+++ b/sed/sed.c
|
|
|
17ee557 |
@@ -75,6 +75,10 @@ bool follow_symlinks = false;
|
|
|
17ee557 |
/* How do we edit files in-place? (we don't if NULL) */
|
|
|
17ee557 |
char *in_place_extension = NULL;
|
|
|
17ee557 |
|
|
|
17ee557 |
+/* Do we use copy or rename when in in-place edit mode? (boolean
|
|
|
17ee557 |
+ value, non-zero for copy, zero for rename).*/
|
|
|
17ee557 |
+int copy_instead_of_rename = 0;
|
|
|
17ee557 |
+
|
|
|
17ee557 |
/* The mode to use to read files, either "rt" or "rb". */
|
|
|
17ee557 |
char *read_mode = "rt";
|
|
|
17ee557 |
|
|
|
17ee557 |
@@ -135,6 +139,8 @@ Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n\
|
|
|
17ee557 |
#endif
|
|
|
17ee557 |
fprintf(out, _(" -i[SUFFIX], --in-place[=SUFFIX]\n\
|
|
|
17ee557 |
edit files in place (makes backup if extension supplied)\n"));
|
|
|
17ee557 |
+ fprintf(out, _(" -c, --copy\n\
|
|
|
17ee557 |
+ use copy instead of rename when shuffling files in -i mode\n"));
|
|
|
17ee557 |
#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(MSDOS) || defined(__EMX__)
|
|
|
17ee557 |
fprintf(out, _(" -b, --binary\n\
|
|
|
17ee557 |
open files in binary mode (CR+LFs are not processed specially)\n"));
|
|
|
17ee557 |
@@ -174,9 +180,9 @@ main(argc, argv)
|
|
|
17ee557 |
char **argv;
|
|
|
17ee557 |
{
|
|
|
17ee557 |
#ifdef REG_PERL
|
|
|
17ee557 |
-#define SHORTOPTS "bsnrRuEe:f:l:i::V:"
|
|
|
17ee557 |
+#define SHORTOPTS "bcsnrRuEe:f:l:i::V:"
|
|
|
17ee557 |
#else
|
|
|
17ee557 |
-#define SHORTOPTS "bsnruEe:f:l:i::V:"
|
|
|
17ee557 |
+#define SHORTOPTS "bcsnruEe:f:l:i::V:"
|
|
|
17ee557 |
#endif
|
|
|
17ee557 |
|
|
|
17ee557 |
static struct option longopts[] = {
|
|
|
17ee557 |
@@ -188,6 +194,7 @@ main(argc, argv)
|
|
|
17ee557 |
{"expression", 1, NULL, 'e'},
|
|
|
17ee557 |
{"file", 1, NULL, 'f'},
|
|
|
17ee557 |
{"in-place", 2, NULL, 'i'},
|
|
|
17ee557 |
+ {"copy", 0, NULL, 'c'},
|
|
|
17ee557 |
{"line-length", 1, NULL, 'l'},
|
|
|
17ee557 |
{"quiet", 0, NULL, 'n'},
|
|
|
17ee557 |
{"posix", 0, NULL, 'p'},
|
|
|
17ee557 |
@@ -254,6 +261,10 @@ main(argc, argv)
|
|
|
17ee557 |
|
|
|
17ee557 |
case 'F':
|
|
|
17ee557 |
follow_symlinks = true;
|
|
|
17ee557 |
+ break;
|
|
|
17ee557 |
+
|
|
|
17ee557 |
+ case 'c':
|
|
|
17ee557 |
+ copy_instead_of_rename = true;
|
|
|
17ee557 |
break;
|
|
|
17ee557 |
|
|
|
17ee557 |
case 'i':
|
|
|
17ee557 |
@@ -334,6 +345,12 @@ to the extent permitted by law.\n\
|
|
|
17ee557 |
}
|
|
|
17ee557 |
}
|
|
|
17ee557 |
|
|
|
17ee557 |
+ if (copy_instead_of_rename && in_place_extension == NULL)
|
|
|
17ee557 |
+ {
|
|
|
17ee557 |
+ fprintf (stderr, _("Error: -c used without -i.\n"));
|
|
|
17ee557 |
+ usage(4);
|
|
|
17ee557 |
+ }
|
|
|
17ee557 |
+
|
|
|
17ee557 |
if (!the_program)
|
|
|
17ee557 |
{
|
|
|
17ee557 |
if (optind < argc)
|
|
|
17ee557 |
diff --git a/sed/sed.h b/sed/sed.h
|
|
|
17ee557 |
index 6b4101d..d4d9aa9 100644
|
|
|
17ee557 |
--- a/sed/sed.h
|
|
|
17ee557 |
+++ b/sed/sed.h
|
|
|
17ee557 |
@@ -233,6 +233,10 @@ extern countT lcmd_out_line_len;
|
|
|
17ee557 |
/* How do we edit files in-place? (we don't if NULL) */
|
|
|
17ee557 |
extern char *in_place_extension;
|
|
|
17ee557 |
|
|
|
17ee557 |
+/* Do we use copy or rename when in in-place edit mode? (boolean
|
|
|
17ee557 |
+ value, non-zero for copy, zero for rename).*/
|
|
|
17ee557 |
+extern int copy_instead_of_rename;
|
|
|
17ee557 |
+
|
|
|
17ee557 |
/* The mode to use to read files, either "rt" or "rb". */
|
|
|
17ee557 |
extern char *read_mode;
|
|
|
17ee557 |
|
|
|
17ee557 |
diff --git a/sed/utils.c b/sed/utils.c
|
|
|
17ee557 |
index 241ef1d..ebe6030 100644
|
|
|
17ee557 |
--- a/sed/utils.c
|
|
|
17ee557 |
+++ b/sed/utils.c
|
|
|
17ee557 |
@@ -39,6 +39,7 @@
|
|
|
17ee557 |
#include <sys/stat.h>
|
|
|
17ee557 |
#include <unistd.h>
|
|
|
17ee557 |
#include <limits.h>
|
|
|
17ee557 |
+#include <fcntl.h>
|
|
|
17ee557 |
|
|
|
17ee557 |
#include "utils.h"
|
|
|
17ee557 |
#include "pathmax.h"
|
|
|
17ee557 |
@@ -408,33 +409,99 @@ follow_symlink(const char *fname)
|
|
|
17ee557 |
return fname;
|
|
|
17ee557 |
#endif /* ENABLE_FOLLOW_SYMLINKS */
|
|
|
17ee557 |
}
|
|
|
17ee557 |
+
|
|
|
17ee557 |
|
|
|
17ee557 |
-/* Panic on failing rename */
|
|
|
17ee557 |
+/* Panic on failing unlink */
|
|
|
17ee557 |
void
|
|
|
17ee557 |
-ck_rename (from, to, unlink_if_fail)
|
|
|
17ee557 |
- const char *from, *to;
|
|
|
17ee557 |
- const char *unlink_if_fail;
|
|
|
17ee557 |
+ck_unlink (name)
|
|
|
17ee557 |
+ const char *name;
|
|
|
17ee557 |
{
|
|
|
17ee557 |
- int rd = rename (from, to);
|
|
|
17ee557 |
- if (rd != -1)
|
|
|
17ee557 |
- return;
|
|
|
17ee557 |
+ if (unlink (name) == -1)
|
|
|
17ee557 |
+ panic (_("cannot remove %s: %s"), name, strerror (errno));
|
|
|
17ee557 |
+}
|
|
|
17ee557 |
|
|
|
17ee557 |
- if (unlink_if_fail)
|
|
|
17ee557 |
+/* Attempt to unlink denoted file if operation rd failed. */
|
|
|
17ee557 |
+static int
|
|
|
17ee557 |
+_unlink_if_fail (rd, unlink_if_fail)
|
|
|
17ee557 |
+ int rd;
|
|
|
17ee557 |
+ const char *unlink_if_fail;
|
|
|
17ee557 |
+{
|
|
|
17ee557 |
+ if (rd == -1 && unlink_if_fail)
|
|
|
17ee557 |
{
|
|
|
17ee557 |
int save_errno = errno;
|
|
|
17ee557 |
+ ck_unlink (unlink_if_fail);
|
|
|
17ee557 |
+ errno = save_errno;
|
|
|
17ee557 |
+ }
|
|
|
17ee557 |
+
|
|
|
17ee557 |
+ return rd != -1;
|
|
|
17ee557 |
+}
|
|
|
17ee557 |
+
|
|
|
17ee557 |
+/* Copy contents between files. */
|
|
|
17ee557 |
+static int
|
|
|
17ee557 |
+_copy (from, to)
|
|
|
17ee557 |
+ const char *from, *to;
|
|
|
17ee557 |
+{
|
|
|
17ee557 |
+ static char buf[4096];
|
|
|
17ee557 |
+
|
|
|
17ee557 |
+ FILE *infile, *outfile;
|
|
|
17ee557 |
+ int c, retval = 0;
|
|
|
17ee557 |
errno = 0;
|
|
|
17ee557 |
- unlink (unlink_if_fail);
|
|
|
17ee557 |
|
|
|
17ee557 |
- /* Failure to remove the temporary file is more severe, so trigger it first. */
|
|
|
17ee557 |
- if (errno != 0)
|
|
|
17ee557 |
- panic (_("cannot remove %s: %s"), unlink_if_fail, strerror (errno));
|
|
|
17ee557 |
+ infile = fopen (from, "r");
|
|
|
17ee557 |
+ if (infile == NULL)
|
|
|
17ee557 |
+ return -1;
|
|
|
17ee557 |
|
|
|
17ee557 |
- errno = save_errno;
|
|
|
17ee557 |
+ outfile = fopen (to, "w");
|
|
|
17ee557 |
+ if (outfile == NULL)
|
|
|
17ee557 |
+ {
|
|
|
17ee557 |
+ fclose (infile);
|
|
|
17ee557 |
+ return -1;
|
|
|
17ee557 |
+ }
|
|
|
17ee557 |
+
|
|
|
17ee557 |
+ while (1)
|
|
|
17ee557 |
+ {
|
|
|
17ee557 |
+ size_t bytes_in = fread (buf, 1, sizeof (buf), infile);
|
|
|
17ee557 |
+ size_t bytes_out;
|
|
|
17ee557 |
+ if (bytes_in == 0)
|
|
|
17ee557 |
+ {
|
|
|
17ee557 |
+ if (ferror (infile))
|
|
|
17ee557 |
+ retval = -1;
|
|
|
17ee557 |
+ break;
|
|
|
17ee557 |
+ }
|
|
|
17ee557 |
+
|
|
|
17ee557 |
+ bytes_out = fwrite (buf, 1, bytes_in, outfile);
|
|
|
17ee557 |
+ if (bytes_out != bytes_in)
|
|
|
17ee557 |
+ {
|
|
|
17ee557 |
+ retval = -1;
|
|
|
17ee557 |
+ break;
|
|
|
17ee557 |
+ }
|
|
|
17ee557 |
}
|
|
|
17ee557 |
|
|
|
17ee557 |
+ fclose (outfile);
|
|
|
17ee557 |
+ fclose (infile);
|
|
|
17ee557 |
+
|
|
|
17ee557 |
+ return retval;
|
|
|
17ee557 |
+}
|
|
|
17ee557 |
+
|
|
|
17ee557 |
+/* Panic on failing rename */
|
|
|
17ee557 |
+void
|
|
|
17ee557 |
+ck_rename (from, to, unlink_if_fail)
|
|
|
17ee557 |
+ const char *from, *to;
|
|
|
17ee557 |
+ const char *unlink_if_fail;
|
|
|
17ee557 |
+{
|
|
|
17ee557 |
+ if (!_unlink_if_fail (rename (from, to), unlink_if_fail))
|
|
|
17ee557 |
panic (_("cannot rename %s: %s"), from, strerror (errno));
|
|
|
17ee557 |
}
|
|
|
17ee557 |
|
|
|
17ee557 |
+/* Attempt to copy file contents between the files. */
|
|
|
17ee557 |
+void
|
|
|
17ee557 |
+ck_fcmove (from, to, unlink_if_fail)
|
|
|
17ee557 |
+ const char *from, *to;
|
|
|
17ee557 |
+ const char *unlink_if_fail;
|
|
|
17ee557 |
+{
|
|
|
17ee557 |
+ if (!_unlink_if_fail (_copy (from, to), unlink_if_fail))
|
|
|
17ee557 |
+ panic (_("cannot copy %s to %s: %s"), from, to, strerror (errno));
|
|
|
17ee557 |
+}
|
|
|
17ee557 |
|
|
|
17ee557 |
|
|
|
17ee557 |
|
|
|
17ee557 |
diff --git a/sed/utils.h b/sed/utils.h
|
|
|
17ee557 |
index d3f431d..b915596 100644
|
|
|
17ee557 |
--- a/sed/utils.h
|
|
|
17ee557 |
+++ b/sed/utils.h
|
|
|
17ee557 |
@@ -32,6 +32,7 @@ const char *follow_symlink P_((const char *path));
|
|
|
17ee557 |
size_t ck_getline P_((char **text, size_t *buflen, FILE *stream));
|
|
|
17ee557 |
FILE * ck_mkstemp P_((char **p_filename, char *tmpdir, char *base));
|
|
|
17ee557 |
void ck_rename P_((const char *from, const char *to, const char *unlink_if_fail));
|
|
|
17ee557 |
+void ck_fcmove P_((const char *from, const char *to, const char *unlink_if_fail));
|
|
|
17ee557 |
|
|
|
17ee557 |
VOID *ck_malloc P_((size_t size));
|
|
|
17ee557 |
VOID *xmalloc P_((size_t size));
|