summaryrefslogtreecommitdiffstats
path: root/debian/patches/010_new-name-adjustments.patch
blob: e0fb7c4ae27322f37e6feb588deee66a60dd242e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
Description: some adjustments made to change the name to ipcalc-ng
 The original upstream name is ipcalc, since already there's a debian
 package with this name we had to rename this one to ipcalc-ng, so
 some adjustments had to be made to the upstream src and manpage.
Author: Fabio Augusto De Muzio Tobich <ftobich@debian.org>
Forwarded: no
Last-Update: 2023-06-12
Index: ipcalc-ng/deaggregate.c
===================================================================
--- ipcalc-ng.orig/deaggregate.c
+++ ipcalc-ng/deaggregate.c
@@ -62,7 +62,7 @@ void deaggregate(char *str, unsigned fla
 	if (d1Str == NULL) {
 		if (!beSilent)
 			fprintf(stderr,
-				"ipcalc: bad deaggregation string: %s\n", str);
+				"ipcalc-ng: bad deaggregation string: %s\n", str);
 		exit(1);
 	}
 	d1Str = trim(d1Str);
@@ -72,7 +72,7 @@ void deaggregate(char *str, unsigned fla
 	if (d2Str == NULL) {
 		if (!beSilent)
 			fprintf(stderr,
-				"ipcalc: bad deaggregation string: %s\n", str);
+				"ipcalc-ng: bad deaggregation string: %s\n", str);
 		exit(1);
 	}
 	d2Str = trim(d2Str);
@@ -108,14 +108,14 @@ void deaggregate_v4(const char *ip1s, co
 
 	if (inet_pton(AF_INET, ip1s, &ip1) <= 0) {
 		if (!beSilent)
-			fprintf(stderr, "ipcalc: bad IPv4 address: %s\n",
+			fprintf(stderr, "ipcalc-ng: bad IPv4 address: %s\n",
 				ip1s);
 		exit(1);
 	}
 
 	if (inet_pton(AF_INET, ip2s, &ip2) <= 0) {
 		if (!beSilent)
-			fprintf(stderr, "ipcalc: bad IPv4 address: %s\n",
+			fprintf(stderr, "ipcalc-ng: bad IPv4 address: %s\n",
 				ip2s);
 		exit(1);
 	}
@@ -125,7 +125,7 @@ void deaggregate_v4(const char *ip1s, co
 
 	if (base > end) {
 		if (!beSilent)
-			fprintf(stderr, "ipcalc: bad range\n");
+			fprintf(stderr, "ipcalc-ng: bad range\n");
 		exit(1);
 	}
 
@@ -183,14 +183,14 @@ void deaggregate_v6(const char *ip1s, co
 
 	if (inet_pton(AF_INET6, ip1s, &ip1) <= 0) {
 		if (!beSilent)
-			fprintf(stderr, "ipcalc: bad IPv6 address: %s\n",
+			fprintf(stderr, "ipcalc-ng: bad IPv6 address: %s\n",
 				ip1s);
 		exit(1);
 	}
 
 	if (inet_pton(AF_INET6, ip2s, &ip2) <= 0) {
 		if (!beSilent)
-			fprintf(stderr, "ipcalc: bad IPv6 address: %s\n",
+			fprintf(stderr, "ipcalc-ng: bad IPv6 address: %s\n",
 				ip2s);
 		exit(1);
 	}
@@ -200,7 +200,7 @@ void deaggregate_v6(const char *ip1s, co
 
 	if (ipv6_cmp(&base, &end) > 0) {
 		if (!beSilent)
-			fprintf(stderr, "ipcalc: bad IPv6 range\n");
+			fprintf(stderr, "ipcalc-ng: bad IPv6 range\n");
 		exit(1);
 	}
 
Index: ipcalc-ng/ipcalc-geoip.c
===================================================================
--- ipcalc-ng.orig/ipcalc-geoip.c
+++ ipcalc-ng/ipcalc-geoip.c
@@ -77,7 +77,7 @@ int geo_setup(void)
 
 	ld = dlopen(LIBNAME, RTLD_LAZY);
 	if (ld == NULL) {
-		snprintf(err, sizeof(err), "ipcalc: could not open %s\n", LIBNAME);
+		snprintf(err, sizeof(err), "ipcalc-ng: could not open %s\n", LIBNAME);
 		ret = -1;
 		goto exit;
 	}
@@ -97,7 +97,7 @@ int geo_setup(void)
 	    pGeoIP_delete == NULL || pGeoIP_record_by_ipnum == NULL ||
 	    pGeoIP_id_by_ipnum == NULL || pGeoIP_id_by_ipnum_v6 == NULL ||
 	    pGeoIP_record_by_ipnum_v6 == NULL) {
-		snprintf(err, sizeof(err), "ipcalc: could not find symbols in libGeoIP\n");
+		snprintf(err, sizeof(err), "ipcalc-ng: could not find symbols in libGeoIP\n");
 	    	ret = -1;
 	    	goto exit;
 	}
Index: ipcalc-ng/ipcalc-maxmind.c
===================================================================
--- ipcalc-ng.orig/ipcalc-maxmind.c
+++ ipcalc-ng/ipcalc-maxmind.c
@@ -77,7 +77,7 @@ int geo_setup(void)
 
 	ld = dlopen(LIBNAME, RTLD_LAZY);
 	if (ld == NULL) {
-		snprintf(err, sizeof(err), "ipcalc: could not open %s\n", LIBNAME);
+		snprintf(err, sizeof(err), "ipcalc-ng: could not open %s\n", LIBNAME);
 		ret = -1;
 		goto exit;
 	}
@@ -91,7 +91,7 @@ int geo_setup(void)
        pMMDB_get_value == NULL ||
        pMMDB_lookup_string == NULL ||
        pMMDB_open == NULL) {
-        snprintf(err, sizeof(err), "ipcalc: could not find symbols in libmaxmind\n");
+        snprintf(err, sizeof(err), "ipcalc-ng: could not find symbols in libmaxmind\n");
         ret = -1;
         goto exit;
     }
Index: ipcalc-ng/ipcalc.1.md
===================================================================
--- ipcalc-ng.orig/ipcalc.1.md
+++ ipcalc-ng/ipcalc.1.md
@@ -1,12 +1,12 @@
-# ipcalc(1) - Perform simple operations on IP addresses and networks
+# ipcalc-ng(1) - Perform simple operations on IP addresses and networks
 
 ## SYNOPSIS
-**ipcalc** [OPTION]... <IP address>[/prefix] [netmask]
+**ipcalc-ng** [OPTION]... <IP address>[/prefix] [netmask]
 
 
 ## Description
 
-**ipcalc** provides a simple way to calculate IP information for a host
+**ipcalc-ng** provides a simple way to calculate IP information for a host
 or network. Depending on the options specified, it may be used to provide
 IP network information in human readable format, in a format suitable for
 parsing in scripts, generate random private addresses, resolve an IP address,
@@ -18,7 +18,7 @@ Otherwise the output is JSON formatted w
 or when specific options are given (e.g., **--prefix**) the output is
 in the **VAR=VALUE** format.
 
-The various options specify what information **ipcalc** should display
+The various options specify what information **ipcalc-ng** should display
 on standard output. Multiple options may be specified.  It is required
 to specify an IP address; several operations require
 a netmask or a CIDR prefix as well.
@@ -41,7 +41,7 @@ a netmask or a CIDR prefix as well.
   Split the provided network using the specified prefix or netmask. That is,
   split up the network into smaller chunks of a specified prefix. When
   combined with no-decorate mode (**--no-decorate**), the split networks
-  will be printed in raw form. Example "ipcalc -S 26 192.168.1.0/24".
+  will be printed in raw form. Example "ipcalc-ng -S 26 192.168.1.0/24".
 
 * **-d**, **--deaggregate**
   Deaggregates the provided address range. That is, print the networks that
@@ -138,7 +138,7 @@ a netmask or a CIDR prefix as well.
 
 ### Display all information of an IPv4
 
-    $ ipcalc --all-info 193.92.150.2/24
+    $ ipcalc-ng --all-info 193.92.150.2/24
     Address:        193.92.150.2
     Network:        193.92.150.0/24
     Netmask:        255.255.255.0 = 24
@@ -156,7 +156,7 @@ a netmask or a CIDR prefix as well.
 
 ### Display information in key-value format
 
-    $ ipcalc -pnmb --minaddr --maxaddr --geoinfo --addrspace 193.92.150.2/255.255.255.224
+    $ ipcalc-ng -pnmb --minaddr --maxaddr --geoinfo --addrspace 193.92.150.2/255.255.255.224
     NETMASK=255.255.255.224
     PREFIX=27
     BROADCAST=193.92.150.31
@@ -168,7 +168,7 @@ a netmask or a CIDR prefix as well.
 
 ### Display all information of an IPv6
 
-    $ ipcalc --all-info 2a03:2880:20:4f06:face:b00c:0:14/64
+    $ ipcalc-ng --all-info 2a03:2880:20:4f06:face:b00c:0:14/64
     Full Address:   2a03:2880:0020:4f06:face:b00c:0000:0014
     Address:        2a03:2880:20:4f06:face:b00c:0:14
     Full Network:   2a03:2880:0020:4f06:0000:0000:0000:0000/64
@@ -186,7 +186,7 @@ a netmask or a CIDR prefix as well.
 
 ### Display JSON output
 
-    $ ipcalc --all-info -j 2a03:2880:20:4f06:face:b00c:0:14/64
+    $ ipcalc-ng --all-info -j 2a03:2880:20:4f06:face:b00c:0:14/64
     {
       "FULLADDRESS":"2a03:2880:0020:4f06:face:b00c:0000:0014",
       "ADDRESS":"2a03:2880:20:4f06:face:b00c:0:14",
@@ -206,17 +206,17 @@ a netmask or a CIDR prefix as well.
 
 ### Lookup of a hostname
 
-    $ ipcalc --lookup-host localhost --no-decorate
+    $ ipcalc-ng --lookup-host localhost --no-decorate
     ::1
 
 ### IPv4 lookup of a hostname
 
-    $ ipcalc --lookup-host localhost --no-decorate -4
+    $ ipcalc-ng --lookup-host localhost --no-decorate -4
     127.0.0.1
 
 ### Reverse lookup of a hostname
 
-    $ ipcalc -h 127.0.0.1 --no-decorate
+    $ ipcalc-ng -h 127.0.0.1 --no-decorate
     localhost
 
 ## Authors
Index: ipcalc-ng/ipcalc.c
===================================================================
--- ipcalc-ng.orig/ipcalc.c
+++ ipcalc-ng/ipcalc.c
@@ -46,13 +46,13 @@ static unsigned flags = 0;
   \file ipcalc.c
   \brief provides utilities for manipulating IP addresses.
 
-  ipcalc provides utilities and a front-end command line interface for
+  ipcalc-ng provides utilities and a front-end command line interface for
   manipulating IP addresses, and calculating various aspects of an ip
   address/netmask/network address/prefix/etc.
 
   Functionality can be accessed from other languages from the library
-  interface, documented here.  To use ipcalc from the shell, read the
-  ipcalc(1) manual page.
+  interface, documented here.  To use ipcalc-ng from the shell, read the
+  ipcalc-ng(1) manual page.
 
   When passing parameters to the various functions, take note of whether they
   take host byte order or network byte order.  Most take host byte order, and
@@ -588,7 +588,7 @@ int get_ipv4_info(const char *ipStr, int
 
 	if (inet_pton(AF_INET, ipStr, &ip) <= 0) {
 		if (!beSilent)
-			fprintf(stderr, "ipcalc: bad IPv4 address: %s\n",
+			fprintf(stderr, "ipcalc-ng: bad IPv4 address: %s\n",
 				ipStr);
 		return -1;
 	}
@@ -625,14 +625,14 @@ int get_ipv4_info(const char *ipStr, int
 
 	if (prefix > 32) {
 		if (!beSilent)
-			fprintf(stderr, "ipcalc: bad IPv4 prefix %d\n", prefix);
+			fprintf(stderr, "ipcalc-ng: bad IPv4 prefix %d\n", prefix);
 		return -1;
 	}
 
 	if (inet_ntop(AF_INET, &ip, namebuf, sizeof(namebuf)) == 0) {
 		if (!beSilent)
 			fprintf(stderr,
-				"ipcalc: error calculating the IPv4 network\n");
+				"ipcalc-ng: error calculating the IPv4 network\n");
 		return -1;
 	}
 	info->ip = safe_strdup(namebuf);
@@ -695,7 +695,7 @@ int get_ipv4_info(const char *ipStr, int
 		if (inet_ntop(AF_INET, &maxhost, namebuf, sizeof(namebuf)) == 0) {
 			if (!beSilent)
 				fprintf(stderr,
-					"ipcalc: error calculating the IPv4 network\n");
+					"ipcalc-ng: error calculating the IPv4 network\n");
 			return -1;
 		}
 
@@ -718,7 +718,7 @@ int get_ipv4_info(const char *ipStr, int
 		if (info->hostname == NULL) {
 			if (!beSilent) {
 				sprintf(errBuf,
-					"ipcalc: cannot find hostname for %s",
+					"ipcalc-ng: cannot find hostname for %s",
 					ipStr);
 				herror(errBuf);
 			}
@@ -897,7 +897,7 @@ int get_ipv6_info(const char *ipStr, int
 
 	if (inet_pton(AF_INET6, ipStr, &ip6) <= 0) {
 		if (!beSilent)
-			fprintf(stderr, "ipcalc: bad IPv6 address: %s\n",
+			fprintf(stderr, "ipcalc-ng: bad IPv6 address: %s\n",
 				ipStr);
 		return -1;
 	}
@@ -908,7 +908,7 @@ int get_ipv6_info(const char *ipStr, int
 	if (inet_ntop(AF_INET6, &ip6, errBuf, sizeof(errBuf)) == 0) {
 		if (!beSilent)
 			fprintf(stderr,
-				"ipcalc: error calculating the IPv6 network\n");
+				"ipcalc-ng: error calculating the IPv6 network\n");
 		return -1;
 	}
 
@@ -916,7 +916,7 @@ int get_ipv6_info(const char *ipStr, int
 
 	if (prefix > 128) {
 		if (!beSilent)
-			fprintf(stderr, "ipcalc: bad IPv6 prefix: %d\n",
+			fprintf(stderr, "ipcalc-ng: bad IPv6 prefix: %d\n",
 				prefix);
 		return -1;
 	} else if (prefix < 0) {
@@ -928,7 +928,7 @@ int get_ipv6_info(const char *ipStr, int
 	if (ipv6_prefix_to_mask(prefix, &mask) == -1) {
 		if (!beSilent)
 			fprintf(stderr,
-				"ipcalc: error converting IPv6 prefix: %d\n",
+				"ipcalc-ng: error converting IPv6 prefix: %d\n",
 				prefix);
 		return -1;
 	}
@@ -941,7 +941,7 @@ int get_ipv6_info(const char *ipStr, int
 	if (inet_ntop(AF_INET6, &network, errBuf, sizeof(errBuf)) == 0) {
 		if (!beSilent)
 			fprintf(stderr,
-				"ipcalc: error calculating the IPv6 network\n");
+				"ipcalc-ng: error calculating the IPv6 network\n");
 		return -1;
 	}
 
@@ -960,7 +960,7 @@ int get_ipv6_info(const char *ipStr, int
 		if (inet_ntop(AF_INET6, &network, errBuf, sizeof(errBuf)) == 0) {
 			if (!beSilent)
 				fprintf(stderr,
-					"ipcalc: error calculating the IPv6 network\n");
+					"ipcalc-ng: error calculating the IPv6 network\n");
 			return -1;
 		}
 
@@ -983,7 +983,7 @@ int get_ipv6_info(const char *ipStr, int
 		if (info->hostname == NULL) {
 			if (!beSilent) {
 				sprintf(errBuf,
-					"ipcalc: cannot find hostname for %s",
+					"ipcalc-ng: cannot find hostname for %s",
 					ipStr);
 				herror(errBuf);
 			}
@@ -1131,7 +1131,7 @@ static
 void usage(unsigned verbose)
 {
 	if (verbose) {
-		fprintf(stderr, "Usage: ipcalc [OPTION...]\n");
+		fprintf(stderr, "Usage: ipcalc-ng [OPTION...]\n");
 		fprintf(stderr, "  -c, --check                     Validate IP address\n");
 		fprintf(stderr, "  -r, --random-private=PREFIX     Generate a random private IP network using\n");
 		fprintf(stderr, "                                  the supplied prefix or mask.\n");
@@ -1175,7 +1175,7 @@ void usage(unsigned verbose)
 		fprintf(stderr, "  -?, --help                      Show this help message\n");
 		fprintf(stderr, "      --usage                     Display brief usage message\n");
 	} else {
-		fprintf(stderr, "Usage: ipcalc [-46sv?] [-c|--check] [-r|--random-private=STRING] [-i|--info]\n");
+		fprintf(stderr, "Usage: ipcalc-ng [-46sv?] [-c|--check] [-r|--random-private=STRING] [-i|--info]\n");
 		fprintf(stderr, "        [--all-info] [-4|--ipv4] [-6|--ipv6] [-a|--address] [-b|--broadcast]\n");
 		fprintf(stderr, "        [-h|--hostname] [-o|--lookup-host=STRING] [-g|--geoinfo]\n");
 		fprintf(stderr, "        [-m|--netmask] [-n|--network] [-p|--prefix] [--minaddr] [--maxaddr]\n");
@@ -1425,12 +1425,12 @@ dist_printf(unsigned * const jsonfirst,
 
 /*!
   \fn main(int argc, const char **argv)
-  \brief wrapper program for ipcalc functions.
+  \brief wrapper program for ipcalc-ng functions.
 
-  This is a wrapper program for the functions that the ipcalc library provides.
+  This is a wrapper program for the functions that the ipcalc-ng library provides.
   It can be used from shell scripts or directly from the command line.
 
-  For more information, please see the ipcalc(1) man page.
+  For more information, please see the ipcalc-ng(1) man page.
 */
 int main(int argc, char **argv)
 {
@@ -1565,7 +1565,7 @@ int main(int argc, char **argv)
 		if (ipStr != NULL) {
 			if (!beSilent)
 				fprintf(stderr,
-					"ipcalc: superfluous option given\n");
+					"ipcalc-ng: superfluous option given\n");
 			exit(1);
 		}
 
@@ -1591,14 +1591,14 @@ int main(int argc, char **argv)
 	if (bit_count(app) > 1) {
 		if (!beSilent)
 			fprintf(stderr,
-				"ipcalc: you cannot mix these options\n");
+				"ipcalc-ng: you cannot mix these options\n");
 		return 1;
 	}
 
 	if ((flags & FLAG_IPV6) && (flags & FLAG_IPV4)) {
 		if (!beSilent)
 			fprintf(stderr,
-				"ipcalc: you cannot specify both IPv4 and IPv6\n");
+				"ipcalc-ng: you cannot specify both IPv4 and IPv6\n");
 		return 1;
 	}
 
@@ -1613,7 +1613,7 @@ int main(int argc, char **argv)
 
 	switch (app) {
 	case APP_VERSION:
-		printf("ipcalc %s\n", VERSION);
+		printf("ipcalc-ng %s\n", VERSION);
 		return 0;
 	case APP_DEAGGREGATE:
 		deaggregate(ipStr, flags);
@@ -1631,7 +1631,7 @@ int main(int argc, char **argv)
 		if (ipStr) {
 			if (!beSilent)
 				fprintf(stderr,
-					"ipcalc: provided superfluous parameter '%s'\n", ipStr);
+					"ipcalc-ng: provided superfluous parameter '%s'\n", ipStr);
 			return 1;
 		}
 
@@ -1639,7 +1639,7 @@ int main(int argc, char **argv)
 		if (prefix < 0) {
 			if (!beSilent)
 				fprintf(stderr,
-					"ipcalc: bad %s prefix: %s\n", (flags&FLAG_IPV6)?"IPv6":"IPv4", randomStr);
+					"ipcalc-ng: bad %s prefix: %s\n", (flags&FLAG_IPV6)?"IPv6":"IPv4", randomStr);
 			return 1;
 		}
 
@@ -1647,7 +1647,7 @@ int main(int argc, char **argv)
 		if (ipStr == NULL) {
 			if (!beSilent)
 				fprintf(stderr,
-					"ipcalc: cannot generate network with prefix: %u\n",
+					"ipcalc-ng: cannot generate network with prefix: %u\n",
 					prefix);
 			return 1;
 		}
@@ -1656,7 +1656,7 @@ int main(int argc, char **argv)
 	if (hostname == NULL && ipStr == NULL) {
 		if (!beSilent) {
 			fprintf(stderr,
-				"ipcalc: ip address expected\n");
+				"ipcalc-ng: ip address expected\n");
 			usage(1);
 		}
 		return 1;
@@ -1674,7 +1674,7 @@ int main(int argc, char **argv)
 		if (ipStr == NULL) {
 			if (!beSilent)
 				fprintf(stderr,
-					"ipcalc: could not resolve %s\n", hostname);
+					"ipcalc-ng: could not resolve %s\n", hostname);
 			return 1;
 		}
 
@@ -1688,7 +1688,7 @@ int main(int argc, char **argv)
 			prefixStr = chptr;
 		} else {
 			if (!beSilent) {
-				fprintf(stderr, "ipcalc: unexpected argument: %s\n",
+				fprintf(stderr, "ipcalc-ng: unexpected argument: %s\n",
 					chptr);
 				usage(1);
 			}
@@ -1707,7 +1707,7 @@ int main(int argc, char **argv)
 		if (prefix < 0) {
 			if (!beSilent)
 				fprintf(stderr,
-					"ipcalc: bad %s prefix: %s\n", (flags & FLAG_IPV6)?"IPv6":"IPv4", prefixStr);
+					"ipcalc-ng: bad %s prefix: %s\n", (flags & FLAG_IPV6)?"IPv6":"IPv4", prefixStr);
 			return 1;
 		}
 	}
@@ -1719,7 +1719,7 @@ int main(int argc, char **argv)
 			if (netmaskStr && prefix >= 0) {
 				if (!beSilent) {
 					fprintf(stderr,
-						"ipcalc: both netmask and prefix specified\n");
+						"ipcalc-ng: both netmask and prefix specified\n");
 					usage(1);
 				}
 				return 1;
@@ -1731,7 +1731,7 @@ int main(int argc, char **argv)
 			if (prefix < 0) {
 				if (!beSilent)
 					fprintf(stderr,
-						"ipcalc: bad IPv4 prefix: %s\n", prefixStr);
+						"ipcalc-ng: bad IPv4 prefix: %s\n", prefixStr);
 				return 1;
 			}
 		}
@@ -1748,7 +1748,7 @@ int main(int argc, char **argv)
 		if (splitPrefix < 0) {
 			if (!beSilent)
 				fprintf(stderr,
-					"ipcalc: bad %s prefix: %s\n", (flags & FLAG_IPV6)?"IPv6":"IPv4", splitStr);
+					"ipcalc-ng: bad %s prefix: %s\n", (flags & FLAG_IPV6)?"IPv6":"IPv4", splitStr);
 			return 1;
 		}
 
Index: ipcalc-ng/netsplit.c
===================================================================
--- ipcalc-ng.orig/netsplit.c
+++ ipcalc-ng/netsplit.c
@@ -67,14 +67,14 @@ void show_split_networks_v4(unsigned spl
 
 	if (inet_pton(AF_INET, info->network, &net) <= 0) {
 		if (!beSilent)
-			fprintf(stderr, "ipcalc: bad IPv4 address: %s\n", info->network);
+			fprintf(stderr, "ipcalc-ng: bad IPv4 address: %s\n", info->network);
 		exit(1);
 	}
 	net.s_addr = ntohl(net.s_addr);
 
 	if (inet_pton(AF_INET, info->broadcast, &broadcast) <= 0) {
 		if (!beSilent)
-			fprintf(stderr, "ipcalc: bad broadcast address: %s\n", info->broadcast);
+			fprintf(stderr, "ipcalc-ng: bad broadcast address: %s\n", info->broadcast);
 		exit(1);
 	}
 	broadcast.s_addr = ntohl(broadcast.s_addr);
@@ -145,25 +145,25 @@ void show_split_networks_v6(unsigned spl
 
 	if (inet_pton(AF_INET6, info->network, &net) <= 0) {
 		if (!beSilent)
-			fprintf(stderr, "ipcalc: bad IPv6 address: %s\n", info->network);
+			fprintf(stderr, "ipcalc-ng: bad IPv6 address: %s\n", info->network);
 		exit(1);
 	}
 
 	if (inet_pton(AF_INET6, info->hostmax, &netlast) <= 0) {
 		if (!beSilent)
-			fprintf(stderr, "ipcalc: bad IPv6 address: %s\n", info->hostmax);
+			fprintf(stderr, "ipcalc-ng: bad IPv6 address: %s\n", info->hostmax);
 		exit(1);
 	}
 
 	if (inet_pton(AF_INET6, info->netmask, &netmask) <= 0) {
 		if (!beSilent)
-			fprintf(stderr, "ipcalc: bad IPv6 mask: %s\n", info->netmask);
+			fprintf(stderr, "ipcalc-ng: bad IPv6 mask: %s\n", info->netmask);
 		exit(1);
 	}
 
 	if (ipv6_prefix_to_mask(split_prefix, &splitmask) < 0) {
 		if (!beSilent)
-			fprintf(stderr, "ipcalc: IPv6 prefix: %d\n", split_prefix);
+			fprintf(stderr, "ipcalc-ng: IPv6 prefix: %d\n", split_prefix);
 		exit(1);
 	}