Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
menus-misc.c parse.c parse.h
Log Message:
Use new destructive line parser to avoid a lot of strdup/free's.
===================================================================
RCS file: /cvs/e/e16/e/src/menus-misc.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- menus-misc.c 26 Feb 2007 04:16:29 -0000 1.42
+++ menus-misc.c 28 May 2007 22:05:29 -0000 1.43
@@ -313,29 +313,28 @@
if (first)
{
- char *wd;
+ char *title;
- wd = field(s, 0);
- if (wd)
- {
- MenuSetTitle(m, wd);
- Efree(wd);
- }
first = 0;
+
+ title = NULL;
+ parse(s, "%S", &title);
+
+ if (!title)
+ continue;
+ MenuSetTitle(m, title);
}
else
{
- char *txt = NULL, *icon = NULL, *act = NULL;
- char *params = NULL, wd[4096];
-
+ char *txt, *icon, *act, *params;
+ char 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);
+ txt = icon = act = params = NULL;
+ parse(s, "%S%T%S%S", &txt, &icon, &act, ¶ms);
+
if (icon && exists(icon))
{
Esnprintf(wd, sizeof(wd), "__FM.%s", icon);
@@ -348,8 +347,8 @@
sscanf(params, "%4000s", wd);
if (path_canexec(wd))
{
- Esnprintf(s, sizeof(s), "exec %s", params);
- mi = MenuItemCreate(txt, icc, s, NULL);
+ Esnprintf(wd, sizeof(wd), "exec %s", params);
+ mi = MenuItemCreate(txt, icc, wd, NULL);
MenuAddItem(m, mi);
}
}
@@ -368,14 +367,6 @@
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);
===================================================================
RCS file: /cvs/e/e16/e/src/parse.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- parse.c 26 Feb 2007 04:16:29 -0000 1.3
+++ parse.c 28 May 2007 22:05:29 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various
contributors
+ * Copyright (C) 2007 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,200 +21,81 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <ctype.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include "parse.h"
-#include "util.h"
-#if 0 /* Unused */
-
-const char *
-atword(const char *s, int num)
+int
+parse(char *buf, const char *fmt, ...)
{
- int cnt, i;
-
- if (!s)
- return NULL;
- cnt = 0;
- i = 0;
-
- while (s[i])
- {
- if ((s[i] != ' ') && (s[i] != '\t'))
- {
- if (i == 0)
- cnt++;
- else if ((s[i - 1] == ' ') || (s[i - 1] == '\t'))
- cnt++;
- if (cnt == num)
- return &s[i];
- }
- i++;
- }
- return NULL;
-}
-
-void
-word(const char *s, int num, char *wd)
-{
- int cnt, i;
- const char *start, *finish, *ss;
-
- if (!s)
- return;
- if (!wd)
- return;
- if (num <= 0)
- {
- *wd = 0;
- return;
- }
- cnt = 0;
- i = 0;
- start = NULL;
- finish = NULL;
- ss = NULL;
-
- while (s[i])
- {
- if ((cnt == num) && ((s[i] == ' ') || (s[i] == '\t')))
- {
- finish = &s[i];
- break;
- }
- if ((s[i] != ' ') && (s[i] != '\t'))
- {
- if (i == 0)
- {
- cnt++;
- if (cnt == num)
- start = &s[i];
- }
- else if ((s[i - 1] == ' ') || (s[i - 1] == '\t'))
- {
- cnt++;
- if (cnt == num)
- start = &s[i];
- }
- }
- i++;
- }
- if (cnt == num)
- {
- if ((start) && (finish))
- {
- for (ss = start; ss < finish; ss++)
- *wd++ = *ss;
- }
- else if (start)
- {
- for (ss = start; *ss != 0; ss++)
- *wd++ = *ss;
- }
- *wd = 0;
- }
-}
+ int nitems;
+ char chi, chf, chq;
+ char *p, **ps;
+ va_list args;
-#endif /* Unused */
+ va_start(args, fmt);
-/* gets word number [num] in the string [s] and copies it into [wd] */
-/* wd is NULL terminated. If word [num] does not exist wd = "" */
-/* NB: this function now handles quotes so for a line: */
-/* Hello to "Welcome sir - may I Help" Shub Foo */
-/* Word 1 = Hello */
-/* Word 2 = to */
-/* Word 3 = Welcome sir - may I Help */
-/* Word 4 = Shub */
-/* word 5 = Foo */
-void
-fword(char *s, int num, char *wd)
-{
- char *cur, *start, *end;
- int count, inword, inquote, len;
-
- if (!s)
- return;
- if (!wd)
- return;
- *wd = 0;
- if (num <= 0)
- return;
- cur = s;
- count = 0;
- inword = 0;
- inquote = 0;
- start = NULL;
- end = NULL;
- while ((*cur) && (count < num))
+ for (nitems = 0;;)
{
- if (inword)
+ chf = *fmt++;
+ if (chf != '%')
+ break;
+ chf = *fmt++;
+ if (chf == '\0')
+ break;
+ /* Strip leading whitespace */
+ while (isspace(*buf))
+ buf++;
+ if (!*buf)
+ break;
+ switch (chf)
{
- if (inquote)
+ case 'S': /* Return pointer to string */
+ case 'T': /* As S, convert "NULL" to NULL pointer */
+ chi = *buf;
+ chq = (chi == '\'' || chi == '"') ? chi : '\0';
+ if (chq)
{
- if (*cur == '"')
+ /* Token is quoted */
+ buf++;
+ for (p = buf;; p++)
{
- inquote = 0;
- inword = 0;
- end = cur;
- count++;
+ p = strchr(p, chq);
+ if (p)
+ {
+ if (p[1] && !isspace(p[1]))
+ continue;
+ *p++ = '\0'; /* Terminate at quote */
+ }
+ else
+ {
+ p = buf + strlen(buf); /* Missing end quote */
+ }
+ break;
}
}
else
{
- if (isspace(*cur))
- {
- end = cur;
- inword = 0;
- count++;
- }
- }
- }
- else
- {
- if (!isspace(*cur))
- {
- if (*cur == '"')
- {
- inquote = 1;
- start = cur + 1;
- }
- else
- start = cur;
- inword = 1;
+ /* Token is unquoted */
+ p = buf + 1;
+ while (*p && !isspace(*p))
+ p++;
+ if (*p)
+ *p++ = '\0';
}
+ ps = va_arg(args, char **);
+
+ if (chf == 'T' && (!buf[0] || !strcmp(buf, "NULL")))
+ *ps = NULL;
+ else
+ *ps = buf;
+ nitems++;
+ buf = p;
}
- if (count == num)
- break;
- cur++;
- }
- if (!start)
- return;
- if (!end)
- end = cur;
- if (end <= start)
- return;
- len = (int)(end - start);
- if (len > 4000)
- len = 4000;
- if (len > 0)
- {
- strncpy(wd, start, len);
- wd[len] = 0;
}
-}
-char *
-field(char *s, int fieldno)
-{
- char buf[4096];
+ va_end(args);
- buf[0] = 0;
- fword(s, fieldno + 1, buf);
- if (buf[0])
- {
- if ((!strcmp(buf, "NULL")) || (!strcmp(buf, "(null)")))
- return NULL;
- return Estrdup(buf);
- }
- return NULL;
+ return nitems;
}
===================================================================
RCS file: /cvs/e/e16/e/src/parse.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- parse.h 26 Feb 2007 04:16:29 -0000 1.3
+++ parse.h 28 May 2007 22:05:29 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various
contributors
+ * Copyright (C) 2007 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -23,7 +23,6 @@
#ifndef _PARSE_H_
#define _PARSE_H_
-char *field(char *s, int fieldno);
-void fword(char *s, int num, char *wd);
+int parse(char *buf, const char *fmt, ...);
#endif /* _PARSE_H_ */
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
