From: Sami Kerola Date: Sat, 4 Aug 2012 07:33:40 +0000 (+0200) Subject: vipw: make vim writebackup mode work X-Git-Tag: v2.22-rc2~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=69a826f187cbef2acf3fda2512f28ea31c42933c;p=thirdparty%2Futil-linux.git vipw: make vim writebackup mode work Some editors, such as Vim with 'writebackup' mode enabled, use "atomic save" in which the old file is deleted and a new one with the same name created in its place. The vipw tries to detect if such happen by looking hard temporary file link count, when it is zero reopen temporary file by using it's path. Reported-by: Mantas Mikulėnas References: http://www.spinics.net/lists/util-linux-ng/msg06666.html Signed-off-by: Sami Kerola --- diff --git a/login-utils/vipw.c b/login-utils/vipw.c index ed3f43bec5..1eeeb0dd7c 100644 --- a/login-utils/vipw.c +++ b/login-utils/vipw.c @@ -275,6 +275,18 @@ static void edit_file(int is_shadow) if (fstat(fileno(tmp_fd), &end)) pw_error(tmp_file, 1, 1); + /* Some editors, such as Vim with 'writebackup' mode enabled, + * use "atomic save" in which the old file is deleted and a new + * one with the same name created in its place. */ + if (end.st_nlink == 0) { + if (close_stream(tmp_fd) != 0) + err(EXIT_FAILURE, _("write error")); + tmp_fd = fopen(tmp_file, "r"); + if (!tmp_file) + err(EXIT_FAILURE, _("cannot open %s"), tmp_file); + if (fstat(fileno(tmp_fd), &end)) + pw_error(tmp_file, 1, 1); + } if (begin.st_mtime == end.st_mtime) { warnx(_("no changes made")); pw_error((char *)NULL, 0, 0);