aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorGravatar Paul Fox <pgf@brightstareng.com>2006-03-28 14:18:21 +0000
committerGravatar Paul Fox <pgf@brightstareng.com>2006-03-28 14:18:21 +0000
commitf0305b7f75714936f87a30cd9c113709a7328446 (patch)
treed7502788892ff78dcdc31d7c0610cad2b9850a20 /editors
parent6850017a2fd73c9e385e79e8af9b0be2da63eb51 (diff)
downloadbusybox-f0305b7f75714936f87a30cd9c113709a7328446.tar.gz
busybox-f0305b7f75714936f87a30cd9c113709a7328446.tar.bz2
fix behavior of ZZ, with respect to readonly mode(s). original
patch and report from Alexander Griesser.
Diffstat (limited to 'editors')
-rw-r--r--editors/vi.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/editors/vi.c b/editors/vi.c
index 1cd1b1ae9..2852b384a 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -3617,12 +3617,13 @@ key_cmd_mode:
indicate_error(c);
break;
}
- if (file_modified
+ if (file_modified) {
#ifdef CONFIG_FEATURE_VI_READONLY
- && ! vi_readonly
- && ! readonly
-#endif /* CONFIG_FEATURE_VI_READONLY */
- ) {
+ if (vi_readonly || readonly) {
+ psbs("\"%s\" File is read only", cfn);
+ break;
+ }
+#endif /* CONFIG_FEATURE_VI_READONLY */
cnt = file_write(cfn, text, end - 1);
if (cnt < 0) {
if (cnt == -1)