[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_1_BRANCH: kdebase/kdm/kfrontend
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2003-08-22 16:26:29
[Download RAW message or body]

CVS commit by ossi: 

make the section name parser understand display names with dashes.


  M +9 -10     kdm_config.c   1.31.2.4


--- kdebase/kdm/kfrontend/kdm_config.c  #1.31.2.3:1.31.2.4
@@ -634,10 +634,11 @@ Debug ("parsing config ...\n");
                 }
             if (nstr[0] == 'X' && nstr[1] == '-') {
-                for (dstr = nstr + 2, dlen = 0; ; dlen++) {
-                    if (dlen + 2 >= nlen)
+                cstr = nstr + nlen;
+                clen = 0;
+                while (++clen, *--cstr != '-');
+                if (cstr == nstr + 1)
                         goto illsec;
-                    if (dstr[dlen] == '-')
-                        break;
-                }
+                dstr = nstr + 2;
+                dlen = nlen - clen - 2;
                 dhost = dstr;
                 dhostl = 0;
@@ -663,7 +664,5 @@ Debug ("parsing config ...\n");
                 dclass = "*";
                 dclassl = 1;
-              gotall:
-                cstr = dstr + dlen;
-                clen = nlen - dlen - 2;
+              gotall: ;
             } else {
                 if (nstr[0] == '-')


[prev in list] [next in list] [prev in thread] [next in thread]