X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=server-src%2Fcmdline.c;h=d29a4f33d0cb6cad3717ca6a0272865fbaa2db51;hb=b116e9366c7b2ea2c2eb53b0a13df4090e176235;hp=4a08dad0f1cfab5d11002535a7adb14010f90e83;hpb=fd48f3e498442f0cbff5f3606c7c403d0566150e;p=debian%2Famanda diff --git a/server-src/cmdline.c b/server-src/cmdline.c index 4a08dad..d29a4f3 100644 --- a/server-src/cmdline.c +++ b/server-src/cmdline.c @@ -25,8 +25,8 @@ * Utility routines for handling command lines. */ -#include #include "amanda.h" +#include #include "match.h" #include "cmdline.h" #include "holding.h" @@ -36,7 +36,8 @@ dumpspec_new( char *host, char *disk, char *datestamp, - char *level) + char *level, + char *write_timestamp) { dumpspec_t *rv; @@ -45,6 +46,7 @@ dumpspec_new( if (disk) rv->disk = stralloc(disk); if (datestamp) rv->datestamp = stralloc(datestamp); if (level) rv->level = stralloc(level); + if (write_timestamp) rv->write_timestamp = stralloc(write_timestamp); return rv; } @@ -58,6 +60,7 @@ dumpspec_free( if (dumpspec->disk) free(dumpspec->disk); if (dumpspec->datestamp) free(dumpspec->datestamp); if (dumpspec->level) free(dumpspec->level); + if (dumpspec->write_timestamp) free(dumpspec->write_timestamp); free(dumpspec); } @@ -90,7 +93,7 @@ cmdline_parse_dumpspecs( switch (arg_state) { case ARG_GET_HOST: arg_state = ARG_GET_DISK; - dumpspec = dumpspec_new(name, NULL, NULL, NULL); + dumpspec = dumpspec_new(name, NULL, NULL, NULL, NULL); list = g_slist_append(list, (gpointer)dumpspec); break; @@ -124,7 +127,7 @@ cmdline_parse_dumpspecs( if (list == NULL && (flags & CMDLINE_EMPTY_TO_WILDCARD)) { dumpspec = dumpspec_new("", "", (flags & CMDLINE_PARSE_DATESTAMP)?"":NULL, - (flags & CMDLINE_PARSE_LEVEL)?"":NULL); + (flags & CMDLINE_PARSE_LEVEL)?"":NULL, ""); list = g_slist_append(list, (gpointer)dumpspec); }