summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Kaivo <jkk@ung.org>2019-08-05 10:48:13 -0400
committerJakob Kaivo <jkk@ung.org>2019-08-05 10:48:13 -0400
commit55c1eb0d65cd1232d81e42053bd236f22018ec27 (patch)
tree95d2d084e22eb97f9700a6c2de8c709b18cc255b
parentc326dd7d3270d6854a1815e87fe99745ef0b589e (diff)
update license
-rw-r--r--cat.c33
1 files changed, 17 insertions, 16 deletions
diff --git a/cat.c b/cat.c
index b27273d..ef977aa 100644
--- a/cat.c
+++ b/cat.c
@@ -1,20 +1,25 @@
/*
* UNG's Not GNU
*
- * Copyright (c) 2011-2017, Jakob Kaivo <jkk@ung.org>
+ * Copyright (c) 2011-2019, Jakob Kaivo <jkk@ung.org>
*
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
*
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
*
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
*/
#define _XOPEN_SOURCE 700
@@ -24,10 +29,6 @@
#include <string.h>
#include <unistd.h>
-/** operands
-INFILE [file...] The name of one or more files to print to stdout. DEF(stdin) DASH(stdin)
-**/
-
static int cat(const char *path)
{
FILE *f = stdin;
@@ -38,7 +39,7 @@ static int cat(const char *path)
if (f == NULL) {
static char *fmt = NULL;
- const char *def = "cat: Couldn't open %s: %s\n";
+ const char *def = "cat: %s: %s\n";
if (fmt == NULL) {
nl_catd catd = catopen("cat", NL_CAT_LOCALE);
fmt = catgets(catd, NL_SETD, 1, def);