Alexander Nicolaysen Sørnes : regedit: Fix concat handling for ANSI files.

Alexandre Julliard julliard at winehq.org
Thu Aug 28 07:00:39 CDT 2008


Module: wine
Branch: master
Commit: b058648ae3be6f4bb8cbace3ad63be2777b50b5d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b058648ae3be6f4bb8cbace3ad63be2777b50b5d

Author: Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Date:   Mon Aug 25 23:38:53 2008 +0200

regedit: Fix concat handling for ANSI files.

---

 programs/regedit/regproc.c |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index 8f05a2d..b65595e 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -666,13 +666,22 @@ void processRegLinesA(FILE *in)
             if (s_eol > line && *(s_eol-1) == '\\') {
                 int c;
                 s = s_eol-1;
-                /* The following error protection could be made more self-
-                 * correcting but I thought it not worth trying.
-                 */
-                if ((c = fgetc (in)) == EOF || c != ' ' ||
-                        (c = fgetc (in)) == EOF || c != ' ')
+
+                do
+                {
+                    c = fgetc(in);
+                } while(c == ' ' || c == '\t');
+
+                if(c == EOF)
+                {
                     fprintf(stderr,"%s: ERROR - invalid continuation.\n",
                             getAppName());
+                }
+                else
+                {
+                    *s = c;
+                    s++;
+                }
                 continue;
             }
 




More information about the wine-cvs mailing list