X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/69819af4834557e60c33bb378e29cf3d4e8269f8..73e1f01148bb9709a405e27f7d3c5a95ea03b859:/sbr/utils.c?ds=sidebyside

diff --git a/sbr/utils.c b/sbr/utils.c
index 2d0acb39..d3d4a860 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -5,9 +5,18 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
-#include <h/signals.h>
+#include "h/mh.h"
+#include "read_yes_or_no_if_tty.h"
+#include "concat.h"
+#include "r1bindex.h"
+#include "context_foil.h"
+#include "context_replace.h"
+#include "context_read.h"
+#include "context_find.h"
+#include "print_help.h"
+#include "error.h"
+#include "h/utils.h"
+#include "h/signals.h"
 #include "m_mktemp.h"
 #include "makedir.h"
 #include <fcntl.h>
@@ -28,7 +37,8 @@ const char plurals[] = "s";
 #define MAXMSGS 256
 
 /* Call malloc(3), exiting on NULL return. */
-void *mh_xmalloc(size_t size)
+void *
+mh_xmalloc(size_t size)
 {
     void *p;
 
@@ -42,7 +52,8 @@ void *mh_xmalloc(size_t size)
 }
 
 /* Call realloc(3), exiting on NULL return. */
-void *mh_xrealloc(void *ptr, size_t size)
+void *
+mh_xrealloc(void *ptr, size_t size)
 {
     void *new;
 
@@ -62,7 +73,8 @@ void *mh_xrealloc(void *ptr, size_t size)
 }
 
 /* Call calloc(3), exiting on NULL return. */
-void *mh_xcalloc(size_t nelem, size_t elsize)
+void *
+mh_xcalloc(size_t nelem, size_t elsize)
 {
     void *p;
 
@@ -77,7 +89,8 @@ void *mh_xcalloc(size_t nelem, size_t elsize)
 }
 
 /* Duplicate a NUL-terminated string, exit on failure. */
-char *mh_xstrdup(const char *src)
+char *
+mh_xstrdup(const char *src)
 {
     size_t n;
     char *dest;
@@ -173,7 +186,8 @@ addlist (char *list, const char *item)
  * folder_exists
  *      Check to see if a folder exists.
  */
-int folder_exists(const char *folder)
+int
+folder_exists(const char *folder)
 {
     struct stat st;
 
@@ -185,7 +199,8 @@ int folder_exists(const char *folder)
  *      Check to see if a folder exists, if not, prompt the user to create
  *      it.
  */
-void create_folder(char *folder, int autocreate, void (*done_callback)(int))
+void
+create_folder(char *folder, int autocreate, void (*done_callback)(int))
 {
     struct stat st;
     extern int errno;
@@ -272,7 +287,8 @@ app_msgnum(struct msgnum_array *msgs, int msgnum)
  * pointer so that the caller can modify it.
  */
 char *
-find_str (const char buf[], size_t buflen, const char *str) {
+find_str (const char buf[], size_t buflen, const char *str)
+{
     const size_t len = strlen (str);
     size_t i;
 
@@ -291,7 +307,8 @@ find_str (const char buf[], size_t buflen, const char *str) {
  * pointer so that the caller can modify it.
  */
 char *
-rfind_str (const char buf[], size_t buflen, const char *str) {
+rfind_str (const char buf[], size_t buflen, const char *str)
+{
     const size_t len = strlen (str);
     size_t i;
 
@@ -305,7 +322,8 @@ rfind_str (const char buf[], size_t buflen, const char *str) {
 
 /* POSIX doesn't have strcasestr() so emulate it. */
 char *
-nmh_strcasestr (const char *s1, const char *s2) {
+nmh_strcasestr (const char *s1, const char *s2)
+{
     const size_t len = strlen (s2);
 
     if (isupper ((unsigned char) s2[0])  ||  islower ((unsigned char)s2[0])) {
@@ -335,7 +353,8 @@ nmh_strcasestr (const char *s1, const char *s2) {
  * reporting a possibly very long external string back to the user.  One
  * of its advantages over strncpy(3) is it doesn't pad in the common
  * case of no truncation. */
-void trunccpy(char *dst, const char *src, size_t size)
+void
+trunccpy(char *dst, const char *src, size_t size)
 {
     if (!size) {
         inform("trunccpy: zero-length destination: \"%.20s\"",
@@ -353,7 +372,8 @@ void trunccpy(char *dst, const char *src, size_t size)
 
 
 /* has_prefix returns true if non-NULL s starts with non-NULL prefix. */
-bool has_prefix(const char *s, const char *prefix)
+bool
+has_prefix(const char *s, const char *prefix)
 {
     while (*s && *s == *prefix) {
         s++;
@@ -365,7 +385,8 @@ bool has_prefix(const char *s, const char *prefix)
 
 
 /* has_suffix returns true if non-NULL s ends with non-NULL suffix. */
-bool has_suffix(const char *s, const char *suffix)
+bool
+has_suffix(const char *s, const char *suffix)
 {
     size_t ls, lsuf;
 
@@ -378,7 +399,8 @@ bool has_suffix(const char *s, const char *suffix)
 
 /* has_suffix_c returns true if non-NULL string s ends with a c before the
  * terminating NUL. */
-bool has_suffix_c(const char *s, int c)
+bool
+has_suffix_c(const char *s, int c)
 {
     return *s && s[strlen(s) - 1] == c;
 }
@@ -386,7 +408,8 @@ bool has_suffix_c(const char *s, int c)
 
 /* trim_suffix_c deletes c from the end of non-NULL string s if it's
  * present, shortening s by 1.  Only one instance of c is removed. */
-void trim_suffix_c(char *s, int c)
+void
+trim_suffix_c(char *s, int c)
 {
     if (!*s)
         return;
@@ -398,7 +421,8 @@ void trim_suffix_c(char *s, int c)
 
 
 /* to_lower runs all of s through tolower(3). */
-void to_lower(char *s)
+void
+to_lower(char *s)
 {
     unsigned char *b;
 
@@ -408,7 +432,8 @@ void to_lower(char *s)
 
 
 /* to_upper runs all of s through toupper(3). */
-void to_upper(char *s)
+void
+to_upper(char *s)
 {
     unsigned char *b;
 
@@ -417,7 +442,8 @@ void to_upper(char *s)
 }
 
 
-int nmh_init(const char *argv0, bool read_context, bool check_version)
+int
+nmh_init(const char *argv0, bool read_context, bool check_version)
 {
     int status = OK;
     char *locale;
@@ -500,7 +526,8 @@ int nmh_init(const char *argv0, bool read_context, bool check_version)
  * use that prefix here.
  */
 int
-nmh_version_changed (int older) {
+nmh_version_changed (int older)
+{
     const char *const context_version = context_find("Version");
 
     if (older) {
@@ -532,7 +559,8 @@ nmh_version_changed (int older) {
  * isascii(3), i.e. is outside [0, 0x7f].  If start is NULL it returns
  * false.  Bytes are examined until a NUL byte, or, if end is not NULL,
  * whilst start is before end. */
-bool contains8bit(const char *start, const char *end)
+bool
+contains8bit(const char *start, const char *end)
 {
     const char *p;
     char c;
@@ -559,7 +587,8 @@ bool contains8bit(const char *start, const char *end)
  * See if input has any 8-bit bytes.
  */
 int
-scan_input (int fd, int *eightbit) {
+scan_input (int fd, int *eightbit)
+{
     int state;
     char buf[BUFSIZ];
 
@@ -581,7 +610,8 @@ scan_input (int fd, int *eightbit) {
  * Convert an int to a char string.
  */
 char *
-m_str(int value) {
+m_str(int value)
+{
     return m_strn(value, 0);
 }
 
@@ -594,7 +624,8 @@ m_str(int value) {
 #define SIZE(n) (sizeof STR(n))
 
 char *
-m_strn(int value, unsigned int width) {
+m_strn(int value, unsigned int width)
+{
     /* Need to include space for negative sign.  But don't use INT_MIN
        because it could be a macro that would fool SIZE(n). */
     static char buffer[SIZE(-INT_MAX)];