From: Michael D. Lowis <mike@mdlowis.com>
Date: Wed, 30 Nov 2016 01:42:31 +0000 (-0500)
Subject: Added utility function to chomp off newlines
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=dd92baf3fd83e436459015f0c28f90ee9a8930c5;p=projs%2Ftide.git

Added utility function to chomp off newlines
---

diff --git a/inc/edit.h b/inc/edit.h
index 4c94f25..2eefce0 100644
--- a/inc/edit.h
+++ b/inc/edit.h
@@ -12,6 +12,7 @@ bool risword(Rune r);
 bool risblank(Rune r);
 char* stringdup(const char* str);
 char* fdgets(int fd);
+char* chomp(char* in);
 
 /* Buffer management functions
  *****************************************************************************/
diff --git a/libedit/utils.c b/libedit/utils.c
index 674c704..70e52c9 100644
--- a/libedit/utils.c
+++ b/libedit/utils.c
@@ -74,3 +74,7 @@ char* fdgets(int fd) {
     if (str) str[len] = '\0';
     return str;
 }
+
+char* chomp(char* in) {
+    return strtok(in, "\r\n");
+}
diff --git a/xedit.c b/xedit.c
index 6820019..3db2bdf 100644
--- a/xedit.c
+++ b/xedit.c
@@ -481,7 +481,7 @@ static void find(char* arg) {
 static void open_file(void) {
     char* file = cmdread(PickFileCmd, NULL);
     if (file) {
-        file[strlen(file)-1] = '\0';
+        file = chomp(file);
         if (!getbuf(EDIT)->path && !getbuf(EDIT)->modified) {
             buf_load(getbuf(EDIT), file);
         } else {
@@ -528,9 +528,6 @@ static void tag_exec(Tag* tag, char* arg) {
     free(arg);
 }
 
-static char* chomp(char* in) {
-    return (in[strlen(in)-1] = '\0', in);
-}
 static void cmd_exec(char* cmd) {
     char op = '\0';
     if (*cmd == '!' || *cmd == '<' || *cmd == '|' || *cmd == '>')