summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--uirc.c47
2 files changed, 5 insertions, 48 deletions
diff --git a/Makefile b/Makefile
index 52bc088..7063fba 100644
--- a/Makefile
+++ b/Makefile
@@ -20,10 +20,10 @@ uninstall:
test -s ${INCLUDE_PREFIX}/uirc || rm -r ${INCLUDE_PREFIX}/uirc
stb:
- @echo "It is best to download the stb library from your system's package manager.
+ @echo "It is best to download the stb library from your system's package manager."
@echo "Press ENTER to manually install the stb headers needed. Otherwise, quit with ^C"
@read
- mkdir -p ${INCLUDE_PREFIX}/uirc
- wget https://raw.githubusercontent.com/nothings/stb/master/stb_image.h -P /usr/include/uirc/stb_image.h
+ mkdir -p ${INCLUDE_PREFIX}/stb
+ wget https://raw.githubusercontent.com/nothings/stb/master/stb_image.h -P /usr/include/stb/stb_image.h
.PHONY: uirc install stb
diff --git a/uirc.c b/uirc.c
index 0cf5f58..bedf76d 100644
--- a/uirc.c
+++ b/uirc.c
@@ -2,14 +2,14 @@
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
-#include "stb_image.h"
+#include <stb/stb_image.h>
const char *VERSION = "0.1.0";
int handleArg(arg) char *arg; {
int value, size;
char flag, *longFlag, first, firstTwo[3];
- const char *help, *license;
+ const char *help;
help = "usage: uirc [-hl] [-r] IMAGE1 [IMAGE2] [...]\n\n"
@@ -24,49 +24,6 @@ int handleArg(arg) char *arg; {
"\t'man uirc'\n\n";
- license = "Two licenses are present in uirc.\n"
- "The stb_image library that is included with uirc is available in the Public Domain:\n\n"
- "This is free and unencumbered software released into the public domain.\n"
- "Anyone is free to copy, modify, publish, use, compile, sell, or distribute this\n"
- "software, either in source code form or as a compiled binary, for any purpose,\n"
- "commercial or non-commercial, and by any means.\n"
- "In jurisdictions that recognize copyright laws, the author or authors of this\n"
- "software dedicate any and all copyright interest in the software to the public\n"
- "domain. We make this dedication for the benefit of the public at large and to\n"
- "the detriment of our heirs and successors. We intend this dedication to be an\n"
- "overt act of relinquishment in perpetuity of all present and future rights to\n"
- "this software under copyright law.\n"
- "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n"
- "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n"
- "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n"
- "AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN\n"
- "ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\n"
- "WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\n"
- "The remaining files and binaries of uirc are available under the BSD 2-Clause:\n"
- "Copyright (c) 2022, Bryson Steck\n"
- "All rights reserved.\n\n"
-
- "Redistribution and use in source and binary forms, with or without\n"
- "modification, are permitted provided that the following conditions are met:\n\n"
-
- "1. Redistributions of source code must retain the above copyright notice, this\n"
- " list of conditions and the following disclaimer.\n\n"
-
- "2. Redistributions in binary form must reproduce the above copyright notice,\n"
- " this list of conditions and the following disclaimer in the documentation\n"
- " and/or other materials provided with the distribution.\n\n"
-
- "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n"
- "AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
- "IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n"
- "DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\n"
- "FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n"
- "DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n"
- "SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n"
- "CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\n"
- "OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n"
- "OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n";
-
flag = '-';
longFlag = "--";
first = arg[0];