* Added remove_crlf_r to search from the end with strrchr()

svn: 1571

src/misc.c

@@ -124,14 +124,34 @@ char *splitnick(char **blah)
   return "";
 }
 
-void remove_crlf(char *line)
+int remove_crlf(char *line)
 {
   char *p = NULL;
+  int removed = 0;
 
-  if ((p = strchr(line, '\n')))
+  if ((p = strchr(line, '\n'))) {
     *p = 0;
-  if ((p = strchr(line, '\r')))
+    removed++
+  } if ((p = strchr(line, '\r')))
     *p = 0;
+    removed++;
+  }
+  return removed;
+}
+
+int remove_crlf_r(char *line)
+{
+  char *p = NULL;
+  int removed = 0;
+
+  if ((p = strrchr(line, '\n'))) {
+    *p = 0;
+    removed++
+  } if ((p = strrchr(line, '\r')))
+    *p = 0;
+    removed++;
+  }
+  return removed;
 }
 
 char *newsplit(char **rest)

src/misc.h

@@ -29,6 +29,7 @@ char *stristr(char *, char *);
 void splitc(char *, char *, char);
 void splitcn(char *, char *, char, size_t);
 void remove_crlf(char *);
+void remove_crlf_r(char *);
 char *newsplit(char **);
 char *splitnick(char **);
 void stridx(char *, char *, int);