m fixesHEADmaster

Signed-off-by: Mattias Andrée <m@maandree.se>

6 files changed, 17 insertions, 25 deletions

diff --git a/COPYING b/COPYING
index 604631e..be633a3 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 splashtool – A simple tool for creating SYSLINUX splashes without fuss
 
-Copyright © 2013, 2014  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2013, 2014  Mattias Andrée (m@maandree.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
diff --git a/Makefile b/Makefile
index caef517..160db92 100644
--- a/Makefile
+++ b/Makefile
@@ -22,19 +22,11 @@ TMPDIR = /tmp
 
 PKGNAME = splashtool
 
-WARN = -Wall -Wextra -pedantic -Wformat=2 -Winit-self -Wmissing-include-dirs   \
-       -Wfloat-equal -Wshadow -Wmissing-prototypes -Wmissing-declarations      \
-       -Wredundant-decls -Wnested-externs -Winline -Wno-variadic-macros        \
-       -Wswitch-default -Wconversion -Wcast-align -Wstrict-overflow            \
-       -Wdeclaration-after-statement -Wundef -Wcast-qual -Wbad-function-cast   \
-       -Wwrite-strings -Waggregate-return -Wpacked -Wstrict-prototypes         \
-       -Wold-style-definition  -Wdouble-promotion -Wtrampolines                \
-       -Wsign-conversion -Wsync-nand -Wlogical-op                              \
-       -Wvector-operation-performance -Wsuggest-attribute=const                \
-       -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure                   \
-       -Wsuggest-attribute=format -Wnormalized=nfkc -Wunsafe-loop-optimizations
+CC = gcc -std=gnu99
 
-FLAGS = -std=gnu99 -Ofast -lm $(WARN)
+CPPFLAGS =
+CFLAGS   =
+LDFLAGS  = lm
 
 
 
@@ -56,11 +48,11 @@ bin/splashtool: src/splashtool
 
 bin/assemble: obj/assemble.o
 	@mkdir -p bin
-	$(CC) $(FLAGS) $(LDFLAGS) -o $@ $<
+	$(CC) -o $@ obj/assemble.o $(LDFLAGS)
 
 obj/assemble.o: src/assemble.c
 	@mkdir -p obj
-	$(CC) $(FLAGS) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+	$(CC) -c -o $@ src/assemble.c $(CFLAGS) $(CPPFLAGS)
 
 .PHONY: doc
 doc: info pdf ps dvi
diff --git a/README b/README
index bf72e8a..6967876 100644
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
 splashtool is a simple tool that lets you create an almost exact
-image of how your SYSLINUX bootloader configurations will reader
+image of how your SYSLINUX bootloader configurations will render
 if you are using vesamenu, so that you can do edits to the
 background image and the syslinux.cfg so that you do not need
-to use a virtual machine and real machine that you reboot.
+to use a virtual machine or real machine that you reboot.
 
 
 ./splashtool <syslinux.cfg> <preview-output.png> [-w | --widescreen]
diff --git a/info/splashtool.texinfo b/info/splashtool.texinfo
index 5f35bfa..2f240a1 100644
--- a/info/splashtool.texinfo
+++ b/info/splashtool.texinfo
@@ -62,17 +62,17 @@ Texts. A copy of the license is included in the section entitled
 @chapter Overview
 
 @command{splashtool} is a simple tool that lets you create an almost
-exact image of how your SYSLINUX bootloader configurations will reader
+exact image of how your SYSLINUX bootloader configurations will render
 if you are using @command{vesamenu}, so that you can do edits to the
 background image and the @file{syslinux.cfg} so that you do not need
-to use a virtual machine and real machine that you reboot.
+to use a virtual machine or real machine that you reboot.
 
 
 
 @node Invoking
 @chapter Invoking
 
-The @command{splashtool} takes two manditory arguments follwed by one
+The @command{splashtool} takes two mandatory arguments followed by one
 optional argument.
 
 The first argument is the @file{syslinux.cfg} file you want to create
@@ -80,9 +80,9 @@ a preview for, the @var{background} and @var{font} specified in the
 file should be relative to @file{syslinux.cfg}, but @command{splashtool}
 also accepts absolute paths.
 
-The second argument is output PNG (Portable Network Graphics) file.
+The second argument is an output PNG (Portable Network Graphics) file.
 
-The third argument is optional is should start with either @option{-w}
+The third argument is optional and should start with either @option{-w}
 or @option{--w}, if you want to create a preview of how it will look
 on a widescreen monitor. @command{splashtool} assumes the image is 640
 by 480 pixels, and the output for widescreen is 853 by 480 pixels.
diff --git a/src/assemble.c b/src/assemble.c
index e08d2d3..092b6d8 100644
--- a/src/assemble.c
+++ b/src/assemble.c
@@ -1,7 +1,7 @@
 /**
  * splashtool – A simple tool for creating SYSLINUX splashes without fuss
  * 
- * Copyright © 2013, 2014  Mattias Andrée (maandree@member.fsf.org)
+ * Copyright © 2013, 2014  Mattias Andrée (m@maandree.se)
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/src/splashtool b/src/splashtool
index 0791b66..9539c70 100755
--- a/src/splashtool
+++ b/src/splashtool
@@ -2,7 +2,7 @@
 # 
 # splashtool – A simple tool for creating SYSLINUX splashes without fuss
 # 
-# Copyright © 2013, 2014  Mattias Andrée (maandree@member.fsf.org)
+# Copyright © 2013, 2014  Mattias Andrée (m@maandree.se)
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -172,7 +172,7 @@ menu_ ()
 {
     line="$(printf "%68s" "" | sed -e 's/ /─/g')"
     echo "┌${line}┐"
-    echo $'│\e\e'"${title}"$'\e'"${border}"$'\e│'
+    printf '│\033\033%s\033%s\033│\n' "${title}" "${border}"
     echo "├${line}┤"
     sed -e 's/^/│\x1b\x1b/' -e 's/$/\x1b'"${border}"'\x1b│/'
     echo "└${line}┘"