Imported Upstream version 2.6.0

[debian/amanda] / recover-src / uscan.l

diff --git a/recover-src/uscan.l b/recover-src/uscan.l
index fbd97a2c92bda2724a53e3cb4a7950c586be18f8..8c86297cb631fd75c0116866d493620083cec884 100644 (file)
--- a/recover-src/uscan.l
+++ b/recover-src/uscan.l
@@ -75,6 +75,8 @@ setdisk               { return SETDISK; }
 setdate                { return SETDATE; }
 setmode                { return SETMODE; }
 settape                { return SETTAPE; }
+setdevice      { return SETDEVICE; }
+-h             { return DASH_H; }
 cd             { return CD; }
 cdx            { return CDX; }
 quit           { return QUIT; }
@@ -113,7 +115,7 @@ mode                { return MODE; }
 
 \"                     {
     if(string_buf != NULL) {
-       printf("ERROR:string_buf != NULL: %s\n",string_buf);
+       g_printf("ERROR:string_buf != NULL: %s\n",string_buf);
     }
     BEGIN(quotedpath);
     strappend(string_buf, yytext);
@@ -242,11 +244,11 @@ ll_parse_date(
        yyerror("invalid second");
     } else if(type < 4) {
        yylval.strval = alloc(DATE_ALLOC_SIZE);
-       snprintf(yylval.strval, DATE_ALLOC_SIZE, "%04d-%02d-%02d", y, m, d);
+       g_snprintf(yylval.strval, DATE_ALLOC_SIZE, "%04d-%02d-%02d", y, m, d);
        ret = DATE;
     } else {
        yylval.strval = alloc(DATE_ALLOC_SIZE);
-       snprintf(yylval.strval, DATE_ALLOC_SIZE, "%04d-%02d-%02d-%02d-%02d-%02d", y, m, d, h, mi, s);
+       g_snprintf(yylval.strval, DATE_ALLOC_SIZE, "%04d-%02d-%02d-%02d-%02d-%02d", y, m, d, h, mi, s);
        ret = DATE;
     }
     return ret;