diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-01-02 19:24:03 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-01-02 19:24:03 +0200 |
commit | c44f0f83448b426935e9aeb07c5d761299144d14 (patch) | |
tree | 696d15a11587c94e3a5f8b356f3f91adc73c789a /src | |
parent | 1b0a4de9fa73dd2453cbd2902c2cd4d000f4abe7 (diff) | |
download | wydawca-c44f0f83448b426935e9aeb07c5d761299144d14.tar.gz wydawca-c44f0f83448b426935e9aeb07c5d761299144d14.tar.bz2 |
$- construct (similar to m4's dnl).
* src/meta.c: Special construct $- removes the character immediately
following it.
* doc/wydawca.texi: Document the use of $- construct.
* src/triplet.c (expand_triplet_ls_full)
(expand_triplet_ls_upload): Keep trailing newline in the expansion.
* tests/etc/notify.rc: Update.
Diffstat (limited to 'src')
-rw-r--r-- | src/meta.c | 5 | ||||
-rw-r--r-- | src/triplet.c | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -78,6 +78,11 @@ meta_expand_string (const char *string, struct metadef *def, void *data, | |||
78 | p++; | 78 | p++; |
79 | break; | 79 | break; |
80 | 80 | ||
81 | case '-': | ||
82 | if (*++p) | ||
83 | p++; | ||
84 | break; | ||
85 | |||
81 | case '{': | 86 | case '{': |
82 | e = strchr (p + 1, '}'); | 87 | e = strchr (p + 1, '}'); |
83 | if (e && (s = find_expansion_word (p + 1, e - p - 1, def, data))) | 88 | if (e && (s = find_expansion_word (p + 1, e - p - 1, def, data))) |
diff --git a/src/triplet.c b/src/triplet.c index f18f573..7f6ac68 100644 --- a/src/triplet.c +++ b/src/triplet.c | |||
@@ -399,7 +399,6 @@ expand_triplet_ls_full (struct metadef *def, void *data) | |||
399 | strcat (def->value, buf[file_directive]); | 399 | strcat (def->value, buf[file_directive]); |
400 | strcat (def->value, "\n"); | 400 | strcat (def->value, "\n"); |
401 | } | 401 | } |
402 | def->value[size-1] = 0; /* Kill terminating newline */ | ||
403 | free (buf[file_dist]); | 402 | free (buf[file_dist]); |
404 | free (buf[file_signature]); | 403 | free (buf[file_signature]); |
405 | free (buf[file_directive]); | 404 | free (buf[file_directive]); |
@@ -430,7 +429,6 @@ expand_triplet_ls_upload (struct metadef *def, void *data) | |||
430 | strcat (def->value, buf[file_signature]); | 429 | strcat (def->value, buf[file_signature]); |
431 | strcat (def->value, "\n"); | 430 | strcat (def->value, "\n"); |
432 | } | 431 | } |
433 | def->value[size-1] = 0; /* Kill terminating newline */ | ||
434 | 432 | ||
435 | free (buf[file_dist]); | 433 | free (buf[file_dist]); |
436 | free (buf[file_signature]); | 434 | free (buf[file_signature]); |