X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Fcmdline.h;h=2d93ab371e8d6b96ca7fdaa1134a6dbe1b0b4a2a;hb=HEAD;hp=9d0489f634ac56eecce59660b674939a008288a2;hpb=e442edb4d5816c4ad107ad9e71164f845eba70ad;p=debian%2Famanda diff --git a/server-src/cmdline.h b/server-src/cmdline.h index 9d0489f..2d93ab3 100644 --- a/server-src/cmdline.h +++ b/server-src/cmdline.h @@ -1,9 +1,10 @@ /* - * Copyright (c) 2005 Zmanda Inc. All Rights Reserved. + * Copyright (c) 2007-2012 Zmanda, Inc. All Rights Reserved. * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY @@ -14,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Contact information: Zmanda Inc, 505 N Mathlida Ave, Suite 120 - * Sunnyvale, CA 94085, USA, or: http://www.zmanda.com + * Contact information: Zmanda Inc, 465 S. Mathilda Ave., Suite 300 + * Sunnyvale, CA 94086, USA, or: http://www.zmanda.com * * Author: Dustin J. Mitchell */ @@ -38,11 +39,12 @@ * * All strings in this struct are independently malloc()ed. */ -typedef struct dumpspec_s { +typedef struct dumpspec_t { char *host; char *disk; char *datestamp; char *level; + char *write_timestamp; } dumpspec_t; /* @@ -55,6 +57,7 @@ typedef struct dumpspec_s { * @param disk: disk name * @param datestamp: datestamp * @param level: level (as a string, allowing regexes) + * @param write_timestamp: timestamp written to tape. * @returns: dumpspec, or NULL on error */ dumpspec_t * @@ -62,7 +65,8 @@ dumpspec_new( char *host, char *disk, char *datestamp, - char *level); + char *level, + char *write_timestamp); /* Free memory associated with a single dumpspec. (Does not chase * next pointers) @@ -115,6 +119,8 @@ cmdline_parse_dumpspecs( # define CMDLINE_PARSE_LEVEL (1<<1) /* an empty argv should result in a wildcard dumpspec */ # define CMDLINE_EMPTY_TO_WILDCARD (1<<2) + /* use exact match instead of host and disk expression */ +# define CMDLINE_EXACT_MATCH (1<<3) /* * Formatting @@ -155,7 +161,7 @@ cmdline_format_dumpspec_components( * the dumpspec list contains a dumpspec with all blank * entries, all holding files are returned. * - * Free the resulting list with g_slist_free_full() + * Free the resulting list with slist_free_full() * * @param dumpspec_list: a list of dumpspecs * @returns: a list of holding disk filenames.