Commit 5b87cb6e authored by Jonathan Hanks's avatar Jonathan Hanks
Browse files

Merge branch 'fix_empty_values' into 'master'

Add patch to fix empty values in arg strings

See merge request cds-packaging/medm!1
parents c46e1d10 f8cc29bb
medm (3.1.9-12) unstable; urgency=medium
* Add patch to fix empty values in arg strings.
-- Erik von Reis <evonreis@caltech.edu> Wed, 24 Nov 2021 17:11:04 -0800
medm (3.1.9-11) unstable; urgency=medium
* Fix build-dependencies to allow for Buster rename of sciplot-dev
......
diff --git a/medm/utils.c b/medm/utils.c
index f113ba9..bc4377d 100644
--- a/medm/utils.c
+++ b/medm/utils.c
@@ -3204,11 +3204,9 @@ NameValueTable *generateNameValueTable(char *argsString, int *numNameValues)
/* name = value, name = value, ... therefore */
/* name delimited by "=" and value delimited by "," */
s1 = copyOfArgsString;
- } else {
- s1 = NULL;
}
- name = strtok(s1,"=");
- value = strtok(NULL,",");
+ name = strsep(&s1,"=");
+ value = strsep(&s1,",");
if(name != NULL && value != NULL) {
/* found legitimate name/value pair, put in table */
j = 0;
......@@ -7,3 +7,4 @@
0006-enable-sciplot.patch
0007-timemachine.patch
0008-reorder-the-context-menu.patch
0009-fix-empty-values-in-argstrings.patch
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment