refresh

diff --git a/meta b/meta
index 748e4c26509e0825fac6fb09e55e5b2fc28946bc..de134516fb642da34011ada1341c6e39a819b366 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 742a1d661b743aaf9871c1b67e94abf5120fb8f7
-Head: 38bf8c7653d22d280109485b3adfbc1d799feecd
+Previous: 8881bf739283460218091be4d16e8e7abf273b4d
+Head: dfe3c8409e2e1fcc2fc11bd7f9287f1c46b36015
 Applied:
   lmc: b355854c79a1e446e87684a41663ad5aae258b73
   lid: 1c005908ee6c257f6fa290df8ce8a45e968d07ab
   acme_gid: 160551b2a4bed277f4c81b52ef33a184f43ca783
-  range: 635f1521dbe9fd405d6429a48fb7bd990d312997
-  refresh-temp: 38bf8c7653d22d280109485b3adfbc1d799feecd
+  range: dfe3c8409e2e1fcc2fc11bd7f9287f1c46b36015
 Unapplied:
 Hidden:

diff --git a/patches/range b/patches/range
index 695ea938319ad6a8a98b683d9e1e5ca8418409c0..206c5e5b7492a33e844b6a725bd78790a41375bb 100644 (file)
--- a/patches/range
+++ b/patches/range
@@ -1,5 +1,5 @@
 Bottom: 1ab5f7833d1baaba821d175e19964a67ad69afe5
-Top:    1ab5f7833d1baaba821d175e19964a67ad69afe5
+Top:    95be46d944a0b8ad21ebe86340c99c1691ee887f
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-17 12:06:05 -0800
 
@@ -13,4 +13,25 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/parse.c b/src/parse.c
+index e90fb09..d1c820f 100644
+--- a/src/parse.c
++++ b/src/parse.c
+@@ -80,8 +80,15 @@ char **parse(char *args, int *count)
+       cpy = malloc(strlen(args) + 1);
+       strcpy(cpy, args);
+ 
+-      token = strtok(cpy, "[");
+-      next = strtok(NULL, "]");
++      if (args[0] == '[') {
++              cpy[0] = '\0';
++              token = cpy;
++              next = strtok(cpy + 1, "]");
++      } else {
++              token = strtok(cpy, "[");
++              next = strtok(NULL, "]");
++      }
++
+       if (!next) {
+               str_size = strlen(token) + 1;
+               str_buf = malloc(str_size);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index a73acee..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: 1ab5f7833d1baaba821d175e19964a67ad69afe5
-Top:    95be46d944a0b8ad21ebe86340c99c1691ee887f
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-17 12:07:36 -0800
-
-Refresh of range
-
----
-
-diff --git a/src/parse.c b/src/parse.c
-index e90fb09..d1c820f 100644
---- a/src/parse.c
-+++ b/src/parse.c
-@@ -80,8 +80,15 @@ char **parse(char *args, int *count)
-       cpy = malloc(strlen(args) + 1);
-       strcpy(cpy, args);
- 
--      token = strtok(cpy, "[");
--      next = strtok(NULL, "]");
-+      if (args[0] == '[') {
-+              cpy[0] = '\0';
-+              token = cpy;
-+              next = strtok(cpy + 1, "]");
-+      } else {
-+              token = strtok(cpy, "[");
-+              next = strtok(NULL, "]");
-+      }
-+
-       if (!next) {
-               str_size = strlen(token) + 1;
-               str_buf = malloc(str_size);