X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=recover-src%2Fuscan.c;h=5821f184c98ba61cc32526f08cf72d73898bb33c;hb=c6f0a88c567f8536c498f554285aed1f8150da18;hp=dc8a9b137875e046298d25e831ae779b1859f8bc;hpb=cd0b924f27312d57bd42f6c4fae2b795139e2d0b;p=debian%2Famanda

diff --git a/recover-src/uscan.c b/recover-src/uscan.c
index dc8a9b1..5821f18 100644
--- a/recover-src/uscan.c
+++ b/recover-src/uscan.c
@@ -359,8 +359,8 @@ static void yy_fatal_error (yyconst char msg[]  );
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 43
-#define YY_END_OF_BUFFER 44
+#define YY_NUM_RULES 44
+#define YY_END_OF_BUFFER 45
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -368,27 +368,28 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[175] =
+static yyconst flex_int16_t yy_accept[183] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   44,   43,   42,   33,
-       33,   41,   26,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   37,   37,   40,   40,   39,   43,   36,
-       41,   41,   41,   41,   41,   42,   33,   33,   33,   41,
-       41,   12,   41,   41,   41,   41,   41,   41,   41,   41,
-       17,   41,   41,   41,   41,   37,   37,   40,   40,    0,
-       40,   38,   11,   41,   41,   41,   41,   18,   13,   41,
-       41,   41,   41,   41,   41,   27,   41,   41,   41,   23,
-       41,   41,   32,   31,   41,   41,   19,   41,   41,   15,
-
-       41,   25,   41,   20,   28,   30,   14,   41,   41,   41,
-       41,   41,   41,   41,   24,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       21,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   34,   41,   22,   29,   16,   41,   41,
-       41,    6,   41,    5,    4,    7,   41,    8,   41,    2,
-        1,   41,   41,   41,   35,   41,    9,   41,   41,   41,
-       41,   10,    3,    0
+        0,    0,    0,    0,    0,    0,   45,   44,   43,   34,
+       34,   42,   27,   42,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   38,   38,   41,   41,   40,   44,   37,
+       42,   42,   42,   42,   42,   43,   34,   34,   34,   42,
+       42,   13,   42,   42,   42,   42,   42,   42,   42,   42,
+       18,   42,   42,   42,   42,   38,   38,   41,   41,    0,
+       41,   39,   12,   42,   42,   42,   42,   19,   14,   42,
+       42,   42,   42,   42,   42,   28,   42,   42,   42,   24,
+       42,   42,   33,   32,   42,   42,   20,   42,   42,   16,
+
+       42,   26,   42,   21,   29,   31,   15,   42,   42,   42,
+       42,   42,   42,   42,   25,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,   22,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   35,   42,   23,   30,   17,
+       42,   42,   42,    6,   42,    5,    4,    7,   42,    8,
+       42,   42,    2,    1,   42,   42,   42,   42,   36,   42,
+        9,   42,   42,   42,   42,   42,   42,   10,   42,    3,
+       11,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -431,120 +432,122 @@ static yyconst flex_int32_t yy_meta[32] =
         4
     } ;
 
-static yyconst flex_int16_t yy_base[179] =
+static yyconst flex_int16_t yy_base[187] =
     {   0,
-        0,    0,   30,   38,   42,    0,  242,  241,   44,   46,
-      240,  239,   36,   52,   56,   59,  245,  250,   73,   80,
-       83,    0,    0,  231,   55,  229,  212,   21,   76,  220,
-      211,  212,  224,    0,   87,   91,  100,  250,    0,  250,
-      222,  217,  225,  212,  209,  103,  106,  109,  112,    0,
-      219,  201,  216,  211,  101,  210,  202,  213,  200,  195,
-        0,  210,  209,  205,  194,    0,  116,  119,  122,  126,
-      129,  250,    0,  208,  194,  195,  200,  185,    0,  204,
-      199,  186,  187,  188,  183,    0,  182,  194,  192,    0,
-      179,  121,    0,    0,  190,  182,    0,  178,  175,    0,
-
-      190,    0,  178,  122,    0,    0,    0,  132,  177,  176,
-      172,  185,  174,  169,    0,  178,  179,  166,  173,  167,
-      163,  160,  157,  159,  158,  169,  160,  158,  166,  162,
-      147,  150,  144,  149,  148,  151,  157,  154,  152,  142,
-      153,  144,  151,    0,  135,    0,    0,    0,  141,  131,
-      123,    0,  129,    0,    0,    0,  125,    0,  107,    0,
-        0,   86,   85,   73,    0,   72,    0,   54,   53,   14,
-        7,    0,    0,  250,  148,  150,  155,  159
+        0,    0,   30,   38,   42,    0,  250,  249,   44,   46,
+      248,  247,   36,   52,   56,   59,  253,  258,   73,   80,
+       83,    0,    0,  239,   55,  237,  220,   21,   76,  228,
+      219,  220,  232,    0,   87,   91,  100,  258,    0,  258,
+      230,  225,  233,  220,  217,  103,  106,  109,  112,    0,
+      227,  209,  224,  219,  101,  218,  210,  221,  208,  203,
+        0,  218,  217,  213,  202,    0,  116,  119,  122,  126,
+      129,  258,    0,  216,  202,  203,  208,  193,    0,  212,
+      207,  194,  195,  196,  191,    0,  190,  202,  200,    0,
+      187,  121,    0,    0,  198,  190,    0,  186,  183,    0,
+
+      198,    0,  186,  122,    0,    0,    0,  132,  185,  184,
+      180,  128,  183,  178,    0,  187,  188,  175,  182,  176,
+      172,  169,  166,  168,  167,  178,  169,  167,  178,  174,
+      170,  155,  158,  152,  157,  156,  159,  165,  162,  160,
+      150,  161,  152,  159,  152,    0,  145,    0,    0,    0,
+      153,  143,  143,    0,  150,    0,    0,    0,  147,    0,
+      126,  119,    0,    0,  135,  131,  117,  121,    0,   76,
+        0,   73,   87,   70,   49,   53,   14,    0,   24,    0,
+        0,  258,  152,  154,  159,  163
     } ;
 
-static yyconst flex_int16_t yy_def[179] =
+static yyconst flex_int16_t yy_def[187] =
     {   0,
-      174,    1,  175,  175,    1,    5,    5,    5,    5,    5,
-        5,    5,    5,    5,    5,    5,  174,  174,  174,  174,
-      174,  176,  176,  176,  176,  176,  176,  176,  176,  176,
-      176,  176,  176,  177,  177,  174,  174,  174,  178,  174,
-      176,  176,  176,  176,  176,  174,  174,  174,  174,  176,
-      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
-      176,  176,  176,  176,  176,  177,  177,  174,  174,  174,
-      174,  174,  176,  176,  176,  176,  176,  176,  176,  176,
-      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
-      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
-
-      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
-      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
-      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
-      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
-      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
-      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
-      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
-      176,  176,  176,    0,  174,  174,  174,  174
+      182,    1,  183,  183,    1,    5,    5,    5,    5,    5,
+        5,    5,    5,    5,    5,    5,  182,  182,  182,  182,
+      182,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  185,  185,  182,  182,  182,  186,  182,
+      184,  184,  184,  184,  184,  182,  182,  182,  182,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  185,  185,  182,  182,  182,
+      182,  182,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,    0,  182,  182,  182,  182
     } ;
 
-static yyconst flex_int16_t yy_nxt[282] =
+static yyconst flex_int16_t yy_nxt[290] =
     {   0,
        18,   19,   20,   21,   22,   18,   22,   23,   22,   24,
        22,   25,   26,   27,   28,   22,   22,   29,   30,   22,
        22,   31,   32,   22,   33,   22,   22,   22,   22,   22,
-       22,   35,   36,   37,   56,   38,   57,  173,   39,   35,
-       36,   37,   22,   38,  172,   44,   39,   40,   41,   22,
+       22,   35,   36,   37,   56,   38,   57,  181,   39,   35,
+       36,   37,   22,   38,  180,   44,   39,   40,   41,   22,
        22,   22,   22,   22,   22,   22,   22,   45,   22,   22,
        22,   44,   22,   22,   22,   22,   22,   52,   42,   43,
-       42,   43,   53,   45,   46,   47,   48,   45,  171,  170,
+       42,   43,   53,   45,   46,   47,   48,   45,  179,  178,
        45,   46,   47,   48,   46,   49,   48,   58,   67,   68,
-       69,   59,   70,   68,   69,  169,  168,   60,  167,  166,
+       69,   59,   70,   68,   69,  177,  176,   60,  175,  174,
 
        61,   70,   71,   69,   46,   47,   48,   46,   47,   48,
        46,   49,   48,   46,   47,   48,   82,   67,   68,   69,
        70,   68,   69,   70,   71,   69,   83,   70,   68,   69,
-       70,   68,   69,  108,  119,  109,  120,  165,  164,  110,
-      163,  122,  111,  121,  162,  123,  112,  124,   34,   34,
-       34,   34,   34,   50,   50,   66,  161,  160,   66,   72,
-      159,   72,   72,   72,  158,  157,  156,  155,  154,  153,
+       70,   68,   69,  108,  119,  109,  120,  128,  173,  110,
+      172,  122,  111,  121,  171,  123,  112,  124,  170,  169,
+      168,  129,   34,   34,   34,   34,   34,   50,   50,   66,
+      167,  166,   66,   72,  165,   72,   72,   72,  164,  163,
+      162,  161,  160,  159,  158,  157,  156,  155,  154,  153,
       152,  151,  150,  149,  148,  147,  146,  145,  144,  143,
       142,  141,  140,  139,  138,  137,  136,  135,  134,  133,
-      132,  131,  130,  129,  128,  127,  126,  125,  118,  117,
-
-      116,  115,  114,  113,  107,  106,  105,  104,  103,  102,
-      101,  100,   99,   98,   97,   96,   95,   94,   93,   92,
-       91,   90,   89,   88,   87,   86,   85,   84,   81,   80,
-       79,   78,   77,   76,   75,   74,   73,   65,   64,   63,
-       62,   55,   54,   51,  174,   22,   22,   22,   22,   17,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174
+
+      132,  131,  130,  127,  126,  125,  118,  117,  116,  115,
+      114,  113,  107,  106,  105,  104,  103,  102,  101,  100,
+       99,   98,   97,   96,   95,   94,   93,   92,   91,   90,
+       89,   88,   87,   86,   85,   84,   81,   80,   79,   78,
+       77,   76,   75,   74,   73,   65,   64,   63,   62,   55,
+       54,   51,  182,   22,   22,   22,   22,   17,  182,  182,
+      182,  182,  182,  182,  182,  182,  182,  182,  182,  182,
+      182,  182,  182,  182,  182,  182,  182,  182,  182,  182,
+      182,  182,  182,  182,  182,  182,  182,  182,  182
     } ;
 
-static yyconst flex_int16_t yy_chk[282] =
+static yyconst flex_int16_t yy_chk[290] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    3,    3,    3,   28,    3,   28,  171,    3,    4,
-        4,    4,   13,    4,  170,   13,    4,    5,    5,    5,
+        1,    3,    3,    3,   28,    3,   28,  179,    3,    4,
+        4,    4,   13,    4,  177,   13,    4,    5,    5,    5,
         9,    5,   10,    5,    5,    5,    5,   13,   14,    5,
         5,   14,   15,    5,    5,   16,    5,   25,    9,    9,
-       10,   10,   25,   14,   19,   19,   19,   15,  169,  168,
+       10,   10,   25,   14,   19,   19,   19,   15,  176,  175,
        16,   20,   20,   20,   21,   21,   21,   29,   35,   35,
-       35,   29,   36,   36,   36,  166,  164,   29,  163,  162,
+       35,   29,   36,   36,   36,  174,  173,   29,  172,  170,
 
        29,   37,   37,   37,   46,   46,   46,   47,   47,   47,
        48,   48,   48,   49,   49,   49,   55,   67,   67,   67,
        68,   68,   68,   69,   69,   69,   55,   70,   70,   70,
-       71,   71,   71,   92,  104,   92,  104,  159,  157,   92,
-      153,  108,   92,  104,  151,  108,   92,  108,  175,  175,
-      175,  175,  175,  176,  176,  177,  150,  149,  177,  178,
-      145,  178,  178,  178,  143,  142,  141,  140,  139,  138,
-      137,  136,  135,  134,  133,  132,  131,  130,  129,  128,
-      127,  126,  125,  124,  123,  122,  121,  120,  119,  118,
-      117,  116,  114,  113,  112,  111,  110,  109,  103,  101,
-
-       99,   98,   96,   95,   91,   89,   88,   87,   85,   84,
-       83,   82,   81,   80,   78,   77,   76,   75,   74,   65,
-       64,   63,   62,   60,   59,   58,   57,   56,   54,   53,
-       52,   51,   45,   44,   43,   42,   41,   33,   32,   31,
-       30,   27,   26,   24,   17,   12,   11,    8,    7,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174
+       71,   71,   71,   92,  104,   92,  104,  112,  168,   92,
+      167,  108,   92,  104,  166,  108,   92,  108,  165,  162,
+      161,  112,  183,  183,  183,  183,  183,  184,  184,  185,
+      159,  155,  185,  186,  153,  186,  186,  186,  152,  151,
+      147,  145,  144,  143,  142,  141,  140,  139,  138,  137,
+      136,  135,  134,  133,  132,  131,  130,  129,  128,  127,
+      126,  125,  124,  123,  122,  121,  120,  119,  118,  117,
+
+      116,  114,  113,  111,  110,  109,  103,  101,   99,   98,
+       96,   95,   91,   89,   88,   87,   85,   84,   83,   82,
+       81,   80,   78,   77,   76,   75,   74,   65,   64,   63,
+       62,   60,   59,   58,   57,   56,   54,   53,   52,   51,
+       45,   44,   43,   42,   41,   33,   32,   31,   30,   27,
+       26,   24,   17,   12,   11,    8,    7,  182,  182,  182,
+      182,  182,  182,  182,  182,  182,  182,  182,  182,  182,
+      182,  182,  182,  182,  182,  182,  182,  182,  182,  182,
+      182,  182,  182,  182,  182,  182,  182,  182,  182
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -624,7 +627,7 @@ int		process_line(char *line);
 
 #line 66 "uscan.l"
 static char *string_buf = NULL;
-#line 628 "uscan.c"
+#line 631 "uscan.c"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -720,7 +723,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -820,7 +823,7 @@ YY_DECL
     /* literal keyword tokens */
 
 
-#line 824 "uscan.c"
+#line 827 "uscan.c"
 
 	if ( !(yy_init) )
 		{
@@ -873,13 +876,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 175 )
+				if ( yy_current_state >= 183 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 250 );
+		while ( yy_base[yy_current_state] != 258 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -956,22 +959,22 @@ YY_RULE_SETUP
 case 11:
 YY_RULE_SETUP
 #line 85 "uscan.l"
-{ BEGIN(needstring); return DASH_H; }
+{ BEGIN(needstring); return SETTRANSLATE; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
 #line 86 "uscan.l"
-{ BEGIN(needstring); return CD; }
+{ BEGIN(needstring); return DASH_H; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
 #line 87 "uscan.l"
-{ BEGIN(needstring); return CDX; }
+{ BEGIN(needstring); return CD; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
 #line 88 "uscan.l"
-{ BEGIN(needstring); return QUIT; }
+{ BEGIN(needstring); return CDX; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
@@ -981,116 +984,121 @@ YY_RULE_SETUP
 case 16:
 YY_RULE_SETUP
 #line 90 "uscan.l"
-{ BEGIN(needstring); return DHIST; }
+{ BEGIN(needstring); return QUIT; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
 #line 91 "uscan.l"
-{ BEGIN(needstring); return LS; }
+{ BEGIN(needstring); return DHIST; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
 #line 92 "uscan.l"
-{ BEGIN(needstring); return ADD; }
+{ BEGIN(needstring); return LS; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
 #line 93 "uscan.l"
-{ BEGIN(needstring); return ADDX; }
+{ BEGIN(needstring); return ADD; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
 #line 94 "uscan.l"
-{ BEGIN(needstring); return LIST; }
+{ BEGIN(needstring); return ADDX; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
 #line 95 "uscan.l"
-{ BEGIN(needstring); return DELETE; }
+{ BEGIN(needstring); return LIST; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
 #line 96 "uscan.l"
-{ BEGIN(needstring); return DELETEX; }
+{ BEGIN(needstring); return DELETE; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
 #line 97 "uscan.l"
-{ BEGIN(needstring); return PWD; }
+{ BEGIN(needstring); return DELETEX; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
 #line 98 "uscan.l"
-{ BEGIN(needstring); return CLEAR; }
+{ BEGIN(needstring); return PWD; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
 #line 99 "uscan.l"
-{ BEGIN(INITIAL); return HELP; }
+{ BEGIN(needstring); return CLEAR; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
 #line 100 "uscan.l"
-{ BEGIN(needstring); return HELP; }
+{ BEGIN(INITIAL); return HELP; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
 #line 101 "uscan.l"
-{ BEGIN(needstring); return LCD; }
+{ BEGIN(needstring); return HELP; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
 #line 102 "uscan.l"
-{ BEGIN(needstring); return LPWD; }
+{ BEGIN(needstring); return LCD; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
 #line 103 "uscan.l"
-{ BEGIN(needstring); return EXTRACT; }
+{ BEGIN(needstring); return LPWD; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
 #line 104 "uscan.l"
-{ BEGIN(needstring); return MODE; }
+{ BEGIN(needstring); return EXTRACT; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
 #line 105 "uscan.l"
-{ BEGIN(needstring); return TAR; }
+{ BEGIN(needstring); return MODE; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
 #line 106 "uscan.l"
-{ BEGIN(needstring); return SMB; }
+{ BEGIN(needstring); return TAR; }
 	YY_BREAK
 case 33:
-/* rule 33 can match eol */
 YY_RULE_SETUP
 #line 107 "uscan.l"
+{ BEGIN(needstring); return SMB; }
+	YY_BREAK
+case 34:
+/* rule 34 can match eol */
+YY_RULE_SETUP
+#line 108 "uscan.l"
 { BEGIN(INITIAL); return NL; }
 	YY_BREAK
 
     /* quoted file names */
 
-case 34:
+case 35:
 YY_RULE_SETUP
-#line 113 "uscan.l"
+#line 114 "uscan.l"
 {
     BEGIN(propertypriority);
     return APPEND;
 }
 	YY_BREAK
-case 35:
+case 36:
 YY_RULE_SETUP
-#line 118 "uscan.l"
+#line 119 "uscan.l"
 {
     BEGIN(needstring);
     return PRIORITY;
 }
 	YY_BREAK
-case 36:
+case 37:
 YY_RULE_SETUP
-#line 123 "uscan.l"
+#line 124 "uscan.l"
 {
     if(string_buf != NULL) {
 	g_printf("ERROR:string_buf != NULL: %s\n",string_buf);
@@ -1099,24 +1107,24 @@ YY_RULE_SETUP
     strappend(string_buf, yytext);
 }
 	YY_BREAK
-case 37:
+case 38:
 YY_RULE_SETUP
-#line 131 "uscan.l"
+#line 132 "uscan.l"
 {
     strappend(string_buf, yytext);
 }
 	YY_BREAK
-case 38:
+case 39:
 YY_RULE_SETUP
-#line 135 "uscan.l"
+#line 136 "uscan.l"
 {
     /* escaped character (including quote) */
     strappend(string_buf, yytext);
 }
 	YY_BREAK
-case 39:
+case 40:
 YY_RULE_SETUP
-#line 140 "uscan.l"
+#line 141 "uscan.l"
 { /* saw closing quote - all done */
     strappend(string_buf, yytext);
     yylval.strval = string_buf;
@@ -1125,10 +1133,10 @@ YY_RULE_SETUP
     return STRING;
 }
 	YY_BREAK
-case 40:
-/* rule 40 can match eol */
+case 41:
+/* rule 41 can match eol */
 YY_RULE_SETUP
-#line 148 "uscan.l"
+#line 149 "uscan.l"
 {
     fprintf(stderr,"Unterminated quoted string\n");
     string_buf = NULL;
@@ -1139,9 +1147,9 @@ YY_RULE_SETUP
 
     /* file names */
 
-case 41:
+case 42:
 YY_RULE_SETUP
-#line 159 "uscan.l"
+#line 160 "uscan.l"
 {
     yylval.strval = stralloc(yytext);
     BEGIN(needstring);
@@ -1151,10 +1159,10 @@ YY_RULE_SETUP
 
     /* whitespace */
 
-case 42:
-/* rule 42 can match eol */
+case 43:
+/* rule 43 can match eol */
 YY_RULE_SETUP
-#line 169 "uscan.l"
+#line 170 "uscan.l"
 ; /* whitespace */
 	YY_BREAK
 
@@ -1166,12 +1174,12 @@ YY_RULE_SETUP
 .	{ yyerror("invalid character"); }
 #endif
 
-case 43:
+case 44:
 YY_RULE_SETUP
-#line 182 "uscan.l"
+#line 183 "uscan.l"
 ECHO;
 	YY_BREAK
-#line 1175 "uscan.c"
+#line 1183 "uscan.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(quotedstring):
 case YY_STATE_EOF(needdevice):
@@ -1470,7 +1478,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 175 )
+			if ( yy_current_state >= 183 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1498,11 +1506,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 175 )
+		if ( yy_current_state >= 183 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 174);
+	yy_is_jam = (yy_current_state == 182);
 
 	return yy_is_jam ? 0 : yy_current_state;
 }
@@ -2176,7 +2184,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 182 "uscan.l"
+#line 183 "uscan.l"