From 5f54075a8be6e041c8fbf56ff6281fc78a6d7929 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 11 Sep 2010 13:32:30 +0800 Subject: vty: Use \r\n in the copyright messages We should use VTY_NEWLINE but our strings are static, always use \r\n as unix terminals can handle that as well. --- openbsc/src/bsc_version.c | 12 ++++++------ openbsc/src/gprs/gb_proxy_main.c | 8 ++++---- openbsc/src/gprs/sgsn_main.c | 8 ++++---- openbsc/src/mgcp/mgcp_main.c | 12 ++++++------ openbsc/src/nat/bsc_nat.c | 8 ++++---- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/openbsc/src/bsc_version.c b/openbsc/src/bsc_version.c index 432e63b6d..effd12152 100644 --- a/openbsc/src/bsc_version.c +++ b/openbsc/src/bsc_version.c @@ -21,11 +21,11 @@ #include "bscconfig.h" const char *openbsc_copyright = - "Copyright (C) 2008-2010 Harald Welte, Holger Freyther\n" - "Contributions by Daniel Willmann, Jan Lübbe,Stefan Schmidt\n" - "Dieter Spaar, Andreas Eversberg\n\n" - "License GPLv2+: GNU GPL version 2 or later \n" - "This is free software: you are free to change and redistribute it.\n" - "There is NO WARRANTY, to the extent permitted by law.\n"; + "Copyright (C) 2008-2010 Harald Welte, Holger Freyther\r\n" + "Contributions by Daniel Willmann, Jan Lübbe,Stefan Schmidt\r\n" + "Dieter Spaar, Andreas Eversberg\r\n\r\n" + "License GPLv2+: GNU GPL version 2 or later \r\n" + "This is free software: you are free to change and redistribute it.\r\n" + "There is NO WARRANTY, to the extent permitted by law.\r\n"; diff --git a/openbsc/src/gprs/gb_proxy_main.c b/openbsc/src/gprs/gb_proxy_main.c index 5ef9ce16e..5f5ac42e5 100644 --- a/openbsc/src/gprs/gb_proxy_main.c +++ b/openbsc/src/gprs/gb_proxy_main.c @@ -60,10 +60,10 @@ void subscr_put() { abort(); } void *tall_bsc_ctx; const char *openbsc_copyright = - "Copyright (C) 2010 Harald Welte and On-Waves\n" - "License GPLv2+: GNU GPL version 2 or later \n" - "This is free software: you are free to change and redistribute it.\n" - "There is NO WARRANTY, to the extent permitted by law.\n"; + "Copyright (C) 2010 Harald Welte and On-Waves\r\n" + "License GPLv2+: GNU GPL version 2 or later \r\n" + "This is free software: you are free to change and redistribute it.\r\n" + "There is NO WARRANTY, to the extent permitted by law.\r\n"; static struct log_target *stderr_target; static char *config_file = "osmo_gbproxy.cfg"; diff --git a/openbsc/src/gprs/sgsn_main.c b/openbsc/src/gprs/sgsn_main.c index a29910a4a..e9dac8b47 100644 --- a/openbsc/src/gprs/sgsn_main.c +++ b/openbsc/src/gprs/sgsn_main.c @@ -66,10 +66,10 @@ struct gprs_ns_inst *sgsn_nsi; static struct log_target *stderr_target; static int daemonize = 0; const char *openbsc_copyright = - "Copyright (C) 2010 Harald Welte and On-Waves\n" - "License GPLv2+: GNU GPL version 2 or later \n" - "This is free software: you are free to change and redistribute it.\n" - "There is NO WARRANTY, to the extent permitted by law.\n"; + "Copyright (C) 2010 Harald Welte and On-Waves\r\n" + "License GPLv2+: GNU GPL version 2 or later \r\n" + "This is free software: you are free to change and redistribute it.\r\n" + "There is NO WARRANTY, to the extent permitted by law.\r\n"; static struct sgsn_instance sgsn_inst = { .config_file = "osmo_sgsn.cfg", diff --git a/openbsc/src/mgcp/mgcp_main.c b/openbsc/src/mgcp/mgcp_main.c index a7a1a12f8..d1e22eadc 100644 --- a/openbsc/src/mgcp/mgcp_main.c +++ b/openbsc/src/mgcp/mgcp_main.c @@ -61,12 +61,12 @@ static int reset_endpoints = 0; static int daemonize = 0; const char *openbsc_copyright = - "Copyright (C) 2009-2010 Holger Freyther and On-Waves\n" - "Contributions by Daniel Willmann, Jan Lübbe,Stefan Schmidt\n" - "Dieter Spaar, Andreas Eversberg, Harald Welte\n\n" - "License GPLv2+: GNU GPL version 2 or later \n" - "This is free software: you are free to change and redistribute it.\n" - "There is NO WARRANTY, to the extent permitted by law.\n"; + "Copyright (C) 2009-2010 Holger Freyther and On-Waves\r\n" + "Contributions by Daniel Willmann, Jan Lübbe,Stefan Schmidt\r\n" + "Dieter Spaar, Andreas Eversberg, Harald Welte\r\n\r\n" + "License GPLv2+: GNU GPL version 2 or later \r\n" + "This is free software: you are free to change and redistribute it.\r\n" + "There is NO WARRANTY, to the extent permitted by law.\r\n"; static char *config_file = "mgcp.cfg"; diff --git a/openbsc/src/nat/bsc_nat.c b/openbsc/src/nat/bsc_nat.c index a4c2d69a4..6485102df 100644 --- a/openbsc/src/nat/bsc_nat.c +++ b/openbsc/src/nat/bsc_nat.c @@ -69,10 +69,10 @@ static struct timer_list sccp_close; static int daemonize = 0; const char *openbsc_copyright = - "Copyright (C) 2010 Holger Hans Peter Freyther and On-Waves\n" - "License GPLv2+: GNU GPL version 2 or later \n" - "This is free software: you are free to change and redistribute it.\n" - "There is NO WARRANTY, to the extent permitted by law.\n"; + "Copyright (C) 2010 Holger Hans Peter Freyther and On-Waves\r\n" + "License GPLv2+: GNU GPL version 2 or later \r\n" + "This is free software: you are free to change and redistribute it.\r\n" + "There is NO WARRANTY, to the extent permitted by law.\r\n"; static struct bsc_nat *nat; static void bsc_send_data(struct bsc_connection *bsc, const uint8_t *data, unsigned int length, int); -- cgit v1.2.3