1a196e50eSopenharmony_ciFrom 65179284ceddc43e6388bf4ed8c2d85cf16e1b2f Mon Sep 17 00:00:00 2001
2a196e50eSopenharmony_ciFrom: Rikard Gynnerstedt <rikard.gynnerstedt@gmail.com>
3a196e50eSopenharmony_ciDate: Thu, 24 Oct 2019 12:48:57 +0200
4a196e50eSopenharmony_ciSubject: [PATCH] license and version print should output to stdout and exit
5a196e50eSopenharmony_ci with code 0
6a196e50eSopenharmony_ciReference: https://gitlab.com/bzip2/bzip2/-/commit/65179284ceddc43e6388bf4ed8c2d85cf16e1b2f
7a196e50eSopenharmony_ciConflict: NA
8a196e50eSopenharmony_ci---
9a196e50eSopenharmony_ci bzip2.c | 10 ++++++----
10a196e50eSopenharmony_ci 1 file changed, 6 insertions(+), 4 deletions(-)
11a196e50eSopenharmony_ci 
12a196e50eSopenharmony_cidiff --git a/bzip2.c b/bzip2.c
13a196e50eSopenharmony_ciindex ed1a33f..6da2905 100644
14a196e50eSopenharmony_ci--- a/bzip2.c
15a196e50eSopenharmony_ci+++ b/bzip2.c
16a196e50eSopenharmony_ci@@ -1600,7 +1600,7 @@ void testf ( Char *name )
17a196e50eSopenharmony_ci static 
18a196e50eSopenharmony_ci void license ( void )
19a196e50eSopenharmony_ci {
20a196e50eSopenharmony_ci-   fprintf ( stderr,
21a196e50eSopenharmony_ci+   fprintf ( stdout,
22a196e50eSopenharmony_ci 
23a196e50eSopenharmony_ci     "bzip2, a block-sorting file compressor.  "
24a196e50eSopenharmony_ci     "Version %s.\n"
25a196e50eSopenharmony_ci@@ -1890,7 +1890,9 @@ IntNative main ( IntNative argc, Char *argv[] )
26a196e50eSopenharmony_ci                case '8': blockSize100k    = 8; break;
27a196e50eSopenharmony_ci                case '9': blockSize100k    = 9; break;
28a196e50eSopenharmony_ci                case 'V':
29a196e50eSopenharmony_ci-               case 'L': license();            break;
30a196e50eSopenharmony_ci+               case 'L': license();
31a196e50eSopenharmony_ci+                         exit ( 0 );
32a196e50eSopenharmony_ci+                         break;
33a196e50eSopenharmony_ci                case 'v': verbosity++; break;
34a196e50eSopenharmony_ci                case 'h': usage ( progName );
35a196e50eSopenharmony_ci                          exit ( 0 );
36a196e50eSopenharmony_ci@@ -1916,8 +1918,8 @@ IntNative main ( IntNative argc, Char *argv[] )
37a196e50eSopenharmony_ci       if (ISFLAG("--keep"))              keepInputFiles   = True;    else
38a196e50eSopenharmony_ci       if (ISFLAG("--small"))             smallMode        = True;    else
39a196e50eSopenharmony_ci       if (ISFLAG("--quiet"))             noisy            = False;   else
40a196e50eSopenharmony_ci-      if (ISFLAG("--version"))           license();                  else
41a196e50eSopenharmony_ci-      if (ISFLAG("--license"))           license();                  else
42a196e50eSopenharmony_ci+      if (ISFLAG("--version"))           { license(); exit ( 0 ); }  else
43a196e50eSopenharmony_ci+      if (ISFLAG("--license"))           { license(); exit ( 0 ); }  else
44a196e50eSopenharmony_ci       if (ISFLAG("--exponential"))       workFactor = 1;             else 
45a196e50eSopenharmony_ci       if (ISFLAG("--repetitive-best"))   redundant(aa->name);        else
46a196e50eSopenharmony_ci       if (ISFLAG("--repetitive-fast"))   redundant(aa->name);        else
47a196e50eSopenharmony_ci-- 
48a196e50eSopenharmony_ciGitLab
49