aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--1-20_detab.c16
-rw-r--r--1-21_entab.c45
2 files changed, 56 insertions, 5 deletions
diff --git a/1-20_detab.c b/1-20_detab.c
index 3101610..e1549e6 100644
--- a/1-20_detab.c
+++ b/1-20_detab.c
@@ -5,11 +5,15 @@
* "Write a program `detab` that replaces tabs in the input with the proper
* number of blanks to space to the next tabstop. Assume a fixed set of
* tabstops, say every 'n' columns. Should 'n' be a variable or a symbolic
- * parameter?
+ * parameter?"
*
* Answer: 'n' should be a symbolic parameter. It's more apparent what's being
* worked with and it's not susceptible to scope. Though, in this simple
* program it really doesn't matter.
+ *
+ * To be correct, this file should use the isprint() function to ensure that
+ * 'column' only gets incremented when a printable character is being read. I'll
+ * come back to this when I learn more of the stdlib.
*/
#define TABWIDTH 8
@@ -30,12 +34,14 @@ int main(void) {
++column;
}
} else {
- // non-tabs simply get output.
- putchar(c);
- ++column;
- // Line-endings should reset the column counter after being output.
if (c == '\n') {
+ // Line-endings should reset the column counter after being output.
+ putchar(c);
column = 0;
+ } else {
+ // Now we can just output and increase column!
+ putchar(c);
+ ++column;
}
}
}
diff --git a/1-21_entab.c b/1-21_entab.c
new file mode 100644
index 0000000..595f583
--- /dev/null
+++ b/1-21_entab.c
@@ -0,0 +1,45 @@
+#include <stdio.h>
+
+/* The C Programming Language: 2nd Edition
+ * Exercise 1-21:
+ * "Write a program `entab` that replaces strings of blanks by the minimum
+ * number of tabs and blanks to achieve the same spacing. Use the same tab
+ * stops as for `detab`. When either a tab or a single blank would suffice to
+ * reach a tab stop, which should be given preference?"
+ *
+ * Answer: A blank. A tab character that comes after (tabstop - 1) blanks makes
+ * little-to-no sense and could mess up alignment in some environments.
+ *
+ */
+
+#define TABWIDTH 8
+
+int main(void) {
+ int c, spaces;
+ spaces = 0;
+ while ((c = getchar()) != EOF) {
+ // Make sure the character is a space...
+ if (c == ' ') {
+ ++spaces;
+ // When spaces is equal to TABWIDTH, we can add a tab
+ if (spaces == TABWIDTH) {
+ putchar('\t');
+ spaces = 0;
+ }
+ } else {
+ /* As soon as we hit a non-space character, we need to make sure
+ * there aren't 1-7 spaces leftover. These need to be output before
+ * we output the non-space character itself! This little loop is
+ * interesting because it solves the problem of leftover spaces
+ * _and_ gets the 'spaces' back to zero, which it needs to be once
+ * we hit a non-space character.
+ */
+ while (spaces != 0) {
+ putchar(' ');
+ --spaces;
+ }
+ // Output the non-space character.
+ putchar(c);
+ }
+ }
+}
ownership and progress are printed in their numeric form, consistent with the OWNERSHIP and PROGRESS dictionaries in the vgstash package. An empty notes field will result in a line ending with a pipe and no whitespace following it. 2018-09-08Add remaining filters to vgstash packagezlg1-2/+11 2018-09-04Update LICENSE to match setup.pyzlg1-80/+67 Whoops. 2018-09-03Branch off from master with pytest, tox, clickzlg16-778/+779 This commit is huge, but contains everything needed for a "proper" build system built on pytest + tox and a CLI built with click. For now, this branch will contain all new vgstash development activity until it reaches feature parity with master. The CLI is installed to pip's PATH. Only the 'init', 'add', and 'list' commands work, with only two filters. This is pre-alpha software, and is therefore not stable yet. 2018-03-18Flesh out filter types and ownership statuszlg3-82/+144 It's time for a refactor to a module; the functionality and interface are clashing. 2018-03-18README.mdown: break line correctlyzlg1-1/+1 2018-03-18add 'playlog' list filterzlg2-2/+9 This filter is used to get an idea of which games you're currently playing through, so you can prioritize games to play when you're bored and detect it when you've beaten a game but haven't marked it as such. 2018-03-13Update helpers a bitzlg1-2/+9 At present, user modification is needed to make these seamless. vgup() may need to be axed in favor of telling the user to make an alias. 2018-03-13Make VGSTASH_DB_LOCATION point to a filezlg2-21/+20 It used to point to a directory, which would then look for .vgstash.db. This behavior was kind of backwards and I don't remember why I did it that way. This change gives users more control over where they put their DB. Be sure to update your environment variable if you have it set! 2016-11-18Remove settings from helpers.shZe Libertine Gamer1-5/+0 Sourcing them in .bash_profile screws up login if they're set. 2016-11-15Correct phrasing in README.Ze Libertine Gamer1-4/+4 2016-11-13DerpZe Libertine Gamer1-0/+1 2016-11-03Improve error handling in shell scriptsZe Libertine Gamer4-3/+23 2016-10-24Correct run_again, add recursionZe Libertine Gamer1-0/+4 Loops and functions -- oh my, what a useful combination. :) 2016-10-21Add quotes to correct behavior for arglistZe Libertine Gamer1-1/+1 2016-10-14updater.sh: add recursion, error handlingZe Libertine Gamer1-43/+101 2016-10-14Correct pipe-handling behaviorZe Libertine Gamer1-1/+9 2016-10-12Clarify a method to move between platformsZe Libertine Gamer1-2/+5 Also correct a typo.