Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
menus-misc.c
Log Message:
Fix parsing menu files without newline at end of file.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus-misc.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- menus-misc.c 16 Jan 2006 12:45:56 -0000 1.28
+++ menus-misc.c 17 Feb 2006 19:16:32 -0000 1.29
@@ -282,6 +282,7 @@
char first = 1;
char s[4096];
int count;
+ unsigned int len;
f = fopen(file, "r");
if (!f)
@@ -296,78 +297,83 @@
count = 0;
while (fgets(s, 4096, f))
{
- s[strlen(s) - 1] = 0;
- if ((s[0]) && s[0] != '#')
+ if (s[0] == '#')
+ continue;
+ len = strlen(s);
+ while (len && (s[len - 1] == '\n' || s[len - 1] == '\r'))
+ len--;
+ if (len == 0)
+ continue;
+ s[len] = '\0';
+
+ if (first)
{
- if (first)
+ char *wd;
+
+ wd = field(s, 0);
+ if (wd)
{
- char *wd;
+ MenuSetTitle(m, wd);
+ Efree(wd);
+ }
+ first = 0;
+ }
+ else
+ {
+ char *txt = NULL, *icon = NULL, *act = NULL;
+ char *params = NULL, *tmp = NULL, wd[4096];
- wd = field(s, 0);
- if (wd)
- {
- MenuSetTitle(m, wd);
- Efree(wd);
- }
- first = 0;
+ MenuItem *mi;
+ ImageClass *icc = NULL;
+ Menu *mm;
+
+ txt = field(s, 0);
+ icon = field(s, 1);
+ act = field(s, 2);
+ params = field(s, 3);
+ tmp = NULL;
+ if (icon && exists(icon))
+ {
+ Esnprintf(wd, sizeof(wd), "__FM.%s", icon);
+ icc = ImageclassFind(wd, 0);
+ if (!icc)
+ icc = ImageclassCreateSimple(wd, icon);
}
- else
+ if ((act) && (!strcmp(act, "exec")) && (params))
{
- char *txt = NULL, *icon = NULL, *act = NULL;
- char *params = NULL, *tmp = NULL, wd[4096];
-
- MenuItem *mi;
- ImageClass *icc = NULL;
- Menu *mm;
-
- txt = field(s, 0);
- icon = field(s, 1);
- act = field(s, 2);
- params = field(s, 3);
- tmp = NULL;
- if (icon && exists(icon))
- {
- Esnprintf(wd, sizeof(wd), "__FM.%s", icon);
- icc = ImageclassFind(wd, 0);
- if (!icc)
- icc = ImageclassCreateSimple(wd, icon);
- }
- if ((act) && (!strcmp(act, "exec")) && (params))
+ word(params, 1, wd);
+ tmp = pathtoexec(wd);
+ if (tmp)
{
- word(params, 1, wd);
- tmp = pathtoexec(wd);
- if (tmp)
- {
- Efree(tmp);
- Esnprintf(s, sizeof(s), "exec %s", params);
- mi = MenuItemCreate(txt, icc, s, NULL);
- MenuAddItem(m, mi);
- }
- }
- else if ((act) && (!strcmp(act, "menu")) && (params))
- {
- Esnprintf(wd, sizeof(wd), "__FM.%s.%i", name, count++);
- mm = MenuCreateFromFlatFile(wd, m, NULL, params);
- if (mm)
- {
- mi = MenuItemCreate(txt, icc, NULL, mm);
- MenuAddItem(m, mi);
- }
+ Efree(tmp);
+ Esnprintf(s, sizeof(s), "exec %s", params);
+ mi = MenuItemCreate(txt, icc, s, NULL);
+ MenuAddItem(m, mi);
}
- else if (act)
+ }
+ else if ((act) && (!strcmp(act, "menu")) && (params))
+ {
+ Esnprintf(wd, sizeof(wd), "__FM.%s.%i", name, count++);
+ mm = MenuCreateFromFlatFile(wd, m, NULL, params);
+ if (mm)
{
- mi = MenuItemCreate(txt, icc, act, NULL);
+ mi = MenuItemCreate(txt, icc, NULL, mm);
MenuAddItem(m, mi);
}
- if (txt)
- Efree(txt);
- if (icon)
- Efree(icon);
- if (act)
- Efree(act);
- if (params)
- Efree(params);
}
+ else if (act)
+ {
+ mi = MenuItemCreate(txt, icc, act, NULL);
+ MenuAddItem(m, mi);
+ }
+ if (txt)
+ Efree(txt);
+ if (icon)
+ Efree(icon);
+ if (act)
+ Efree(act);
+ if (params)
+ Efree(params);
}
}
fclose(f);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
