fix cross-device links with --follow-symlinks

2007-08-14  Paolo Bonzini  <bonzini@gnu.org>

	* sed/execute.c (open_next_file): Follow symlink here...
	(closedown): ... not here.

git-archimport-id: bonzini@gnu.org--2004b/sed--stable--4.1--patch-96

1 files changed, 8 insertions, 8 deletions

diff --git a/sed/execute.c b/sed/execute.c
index e33c7f8..490d3b7 100644
--- a/sed/execute.c
+++ b/sed/execute.c
@@ -707,16 +707,20 @@ open_next_file(name, input)
   if (in_place_extension)
     {
       int input_fd, output_fd;
-      char *tmpdir = ck_strdup(name), *p;
+      char *tmpdir, *p;
       struct stat st;
 
+      if (follow_symlinks)
+	input->in_file_name = follow_symlink (name);
+      else
+        input->in_file_name = name;
+
       /* get the base name */
+      tmpdir = ck_strdup(input->in_file_name);
       if (p = strrchr(tmpdir, '/'))
 	*(p + 1) = 0;
       else
 	strcpy(tmpdir, ".");
-      
-      input->in_file_name = name;
 
       if (isatty (fileno (input->fp)))
         panic(_("couldn't edit %s: is a terminal"), input->in_file_name);
@@ -762,11 +766,7 @@ closedown(input)
       const char *target_name;
       ck_fclose (output_file.fp);
 
-      if (follow_symlinks)
-	target_name = follow_symlink (input->in_file_name);
-      else
-	target_name = input->in_file_name;
-
+      target_name = input->in_file_name;
       if (strcmp(in_place_extension, "*") != 0)
         {
           char *backup_file_name = get_backup_file_name(target_name);