diff options
| author | Leon van Stuivenberg <l.vanstuivenberg@chello.nl> | 2012-10-28 23:37:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-29 01:03:02 +0100 |
| commit | c5be6192f0a50eb8a2134c32b7d57f1d88736adf (patch) | |
| tree | 5c23fd6800abb519e0b09a720023ce7670fed588 /cmdutils.c | |
| parent | c2e2b3029e7f6d81dc2e0dae82b92f05c03c376b (diff) | |
cmdutils: avoid using cpp directives within printf macro arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
It appears such construct has undefined behavior
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/cmdutils.c b/cmdutils.c index e9565d2635..98fc5f162f 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -701,12 +701,13 @@ int show_version(void *optctx, const char *opt, const char *arg) int show_license(void *optctx, const char *opt, const char *arg) { - printf( #if CONFIG_NONFREE + printf( "This version of %s has nonfree parts compiled in.\n" "Therefore it is not legally redistributable.\n", - program_name + program_name ); #elif CONFIG_GPLV3 + printf( "%s is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" "the Free Software Foundation; either version 3 of the License, or\n" @@ -719,8 +720,9 @@ int show_license(void *optctx, const char *opt, const char *arg) "\n" "You should have received a copy of the GNU General Public License\n" "along with %s. If not, see <http://www.gnu.org/licenses/>.\n", - program_name, program_name, program_name + program_name, program_name, program_name ); #elif CONFIG_GPL + printf( "%s is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" "the Free Software Foundation; either version 2 of the License, or\n" @@ -734,8 +736,9 @@ int show_license(void *optctx, const char *opt, const char *arg) "You should have received a copy of the GNU General Public License\n" "along with %s; if not, write to the Free Software\n" "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n", - program_name, program_name, program_name + program_name, program_name, program_name ); #elif CONFIG_LGPLV3 + printf( "%s is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU Lesser General Public License as published by\n" "the Free Software Foundation; either version 3 of the License, or\n" @@ -748,8 +751,9 @@ int show_license(void *optctx, const char *opt, const char *arg) "\n" "You should have received a copy of the GNU Lesser General Public License\n" "along with %s. If not, see <http://www.gnu.org/licenses/>.\n", - program_name, program_name, program_name + program_name, program_name, program_name ); #else + printf( "%s is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU Lesser General Public\n" "License as published by the Free Software Foundation; either\n" @@ -763,9 +767,8 @@ int show_license(void *optctx, const char *opt, const char *arg) "You should have received a copy of the GNU Lesser General Public\n" "License along with %s; if not, write to the Free Software\n" "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n", - program_name, program_name, program_name + program_name, program_name, program_name ); #endif - ); return 0; } |