fix behavior of ZZ, with respect to readonly mode(s). original

patch and report from Alexander Griesser.


git-svn-id: svn://busybox.net/trunk/busybox@14679 69ca8d6d-28ef-0310-b511-8ec308f3f277

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)