Re: -S option segfaults

[Akim Demaille]

Keep the list in the CC.

| On Tuesday 03 September 2002 18:49, Akim Demaille wrote:
| [...]
| > I'm using Alexandre Oliva's cvsutils.  I'm using cvsdiff.
| Thanks
| 
| [...]
| Your patch is more clean, but I made this because I think "If `-SFeature', 
| pass the empty value to libppd," is your choice.

Yes, I agree.  But let's keep this for 4.50.

| Now we are agree.
| 
| Can I commit this patch ?

Sure.

| I add a fix to parse errors with bison 1.49b (too much ';' )

Please, one patch/commit per purpose.  You are submitting a patch for
a different issue, so make it another patch.  And, yes, please install
it in both a2pses.


| Index: ChangeLog
| from  Franck Lombardi  <address@hidden>
| 
|       * src/parsessh.y: Remove parse error with bison 1.49b
|       * lib/options.c: If `-SFeature' then remove Feature
|       Reported by Daniel Jonsson.
| 
| Index: lib/options.c
| ===================================================================
| RCS file: /cvsroot/a2ps/a2ps/lib/options.c,v
| retrieving revision 1.1.1.1
| diff -u -r1.1.1.1 options.c
| --- lib/options.c 4 Mar 2002 18:46:25 -0000 1.1.1.1
| +++ lib/options.c 3 Sep 2002 21:52:22 -0000
| @@ -461,23 +461,17 @@
|       {
|         char *value;
|         value = optarg + strcspn (optarg, " \t:=");
| -       /* If `-SFeature:' then remove Feature,
| -          If `-SFeature', pass the empty value to libppd,
| -          it may decide the right thing to do,
| +       /* If `-SFeature:' or `-SFeature' then remove Feature,
|            otherwise (-SFeature:value) pass to libppd */
|         if (*value)
|           {
|             *value = '\0';
|             value ++;
| -           if (*value)
| -             setpagedevice (job, optarg, value);
| -           else
| -             delpagedevice (job, optarg);
|           }
| +       if (*value)
| +         setpagedevice (job, optarg, value);
|         else
| -         {
| -           setpagedevice (job, optarg, NULL);
| -         }
| +         delpagedevice (job, optarg);
|       }
|        break;
|  
| Index: src/parsessh.y
| ===================================================================
| RCS file: /cvsroot/a2ps/a2ps/src/parsessh.y,v
| retrieving revision 1.1.1.1
| diff -u -r1.1.1.1 parsessh.y
| --- src/parsessh.y 4 Mar 2002 18:46:28 -0000 1.1.1.1
| +++ src/parsessh.y 3 Sep 2002 21:52:23 -0000
| @@ -242,7 +242,7 @@
|  /*           Dealing with the inessential informations               */
|  /************************************************************************/
|  requirement :
| -       tREQUIRES tA2PS tSTRING { $$ = $3 ; } ;
| +       tREQUIRES tA2PS tSTRING { $$ = $3 ; }
|       | tREQUIRES tA2PS tVERSION tSTRING { $$ = $4 ; } ;
|  
|  documentation :
| @@ -267,7 +267,7 @@
|  authors : tWRITTEN tBY tSTRING       { $$ = $3 ; };
|  
|  version :
| -       tVERSION tIS tSTRING  { $$ = $3 ; };
| +       tVERSION tIS tSTRING  { $$ = $3 ; }
|       | tVERSION tSTRING      { $$ = $2 ; };
|  
|  /************************************************************************/
| @@ -717,7 +717,7 @@
|         /* Only one */
|         $$ = words_new ("Closing: Strings", "Closing: Regexps", 2, 2);
|         words_add_regex ($$, $1);
| -     };
| +     }
|       | tCLOSERS operators_def tCLOSERS
|       {
|         /* Several, comma separated, between () */
| 
|