Use lower_case names for global functions and data: util2.h

Author: LegalizeAdulthood

inews/inews.cpp

@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
     cp = get_val("NNTPSERVER");
     if (!cp)
     {
-        cp = filexp(SERVER_NAME);
+        cp = file_exp(SERVER_NAME);
         if (FILE_REF(cp))
         {
             cp = nntp_server_name(cp);
@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
             g_nntplink.port_number = std::atoi(cp+1);
         }
         line_end = "\r\n";
-        g_nntp_auth_file = filexp(NNTP_AUTH_FILE);
+        g_nntp_auth_file = file_exp(NNTP_AUTH_FILE);
         if ((cp = std::getenv("NNTP_FORCE_AUTH")) != nullptr
          && (*cp == 'y' || *cp == 'Y'))
         {
@@ -399,7 +399,7 @@ void append_signature()
         return;
     }
 
-    fp = std::fopen(filexp(SIGNATURE_FILE), "r");
+    fp = std::fopen(file_exp(SIGNATURE_FILE), "r");
     if (fp == nullptr)
     {
         return;

libtrn/art.cpp

@@ -357,11 +357,11 @@ DoArticleResult do_article()
                     if ((s = std::strchr(bufptr,'\n')) != nullptr
                      && s-bufptr < sizeof g_art_line)
                     {
-                        safecpy(g_art_line,bufptr,s-bufptr+1);
+                        safe_copy(g_art_line,bufptr,s-bufptr+1);
                     }
                     else
                     {
-                        safecpy(g_art_line,bufptr,sizeof g_art_line);
+                        safe_copy(g_art_line,bufptr,sizeof g_art_line);
                     }
                     s = extract_name(g_art_line + 6);
                     if (s != nullptr)

libtrn/artio.cpp

@@ -534,7 +534,7 @@ char *read_art_buf(bool view_inline)
                         for (t++; *++t == ' ' || *t == '\t'; spaces++)
                         {
                         }
-                        safecpy(t-spaces,t,extra_chars);
+                        safe_copy(t-spaces,t,extra_chars);
                         extra_chars -= spaces;
                         t -= spaces + 1;
                     }

libtrn/artsrch.cpp

@@ -93,7 +93,7 @@ ArtSearchResult art_search(char *pat_buf, int pat_buf_siz, bool get_cmd)
             srchhdr = g_art_srch_hdr;
             doread = g_art_do_read;
         }
-        char *s = cpytill(g_buf,pat_buf+1,cmdchr);/* ok to cpy g_buf+1 to g_buf */
+        char *s = copy_till(g_buf,pat_buf+1,cmdchr);/* ok to cpy g_buf+1 to g_buf */
         pattern = g_buf;
         if (*pattern)
         {
@@ -111,7 +111,7 @@ ArtSearchResult art_search(char *pat_buf, int pat_buf_siz, bool get_cmd)
 
                 case 'H':               /* scan a specific header */
                     howmuch = ARTSCOPE_ONE_HDR;
-                    s = cpytill(g_msg, s+1, ':');
+                    s = copy_till(g_msg, s+1, ':');
                     srchhdr = get_header_num(g_msg);
                     goto loop_break;
 
@@ -364,7 +364,7 @@ ArtSearchResult art_search(char *pat_buf, int pat_buf_siz, bool get_cmd)
             *s++ = g_scope_str[howmuch];
             if (howmuch == ARTSCOPE_ONE_HDR)
             {
-                safecpy(s,g_htype[srchhdr].name,LBUFLEN-(s-saltbuf));
+                safe_copy(s,g_htype[srchhdr].name,LBUFLEN-(s-saltbuf));
                 s += g_htype[srchhdr].length;
                 if (s - saltbuf > LBUFLEN-2)
                 {
@@ -377,7 +377,7 @@ ArtSearchResult art_search(char *pat_buf, int pat_buf_siz, bool get_cmd)
         {
             cmdlst = save_str("j");
         }
-        safecpy(s,cmdlst,LBUFLEN-(s-saltbuf));
+        safe_copy(s,cmdlst,LBUFLEN-(s-saltbuf));
         kill_file_append(saltbuf, saltaway == 2? KF_GLOBAL : KF_LOCAL);
     }
     if (get_cmd)

libtrn/backpage.cpp

@@ -18,7 +18,7 @@ static long    s_oldoffset{-1};     /* offset to block currently in window */
 
 void back_page_init()
 {
-    const char *varyname = filexp(VARYNAME);
+    const char *varyname = file_exp(VARYNAME);
     close(creat(varyname,0600));
     s_varyfd = open(varyname,2);
     remove(varyname);

libtrn/bits.cpp

@@ -755,14 +755,14 @@ static int chase_xref(ArticleNum artnum, int markread)
         termdown(1);
     }
 # endif
-    curxref = cpytill(tmpbuf,xref_buf,' ') + 1;
+    curxref = copy_till(tmpbuf,xref_buf,' ') + 1;
 # ifdef VALIDATE_XREF_SITE
     if (valid_xref_site(artnum,tmpbuf))
 # endif
     {
         while (*curxref)            /* for each newsgroup */
         {
-            curxref = cpytill(tmpbuf,curxref,' ');
+            curxref = copy_till(tmpbuf,curxref,' ');
             xartnum = std::strchr(tmpbuf,':');
             if (!xartnum)
             {
@@ -839,7 +839,7 @@ static bool valid_xref_site(ART_NUM artnum, char *site)
     if (s != nullptr)
     {
         *s = '\0';
-        inews_site = savestr(sitebuf);
+        inews_site = save_str(sitebuf);
     }
 #else /* ANCIENT_NEWS */
     /* Grab the site from the Posting-Version line */
@@ -852,12 +852,12 @@ static bool valid_xref_site(ART_NUM artnum, char *site)
         {
             *t = '\0';
         }
-        inews_site = savestr(s+7);
+        inews_site = save_str(s+7);
     }
 #endif /* ANCIENT_NEWS */
     else
     {
-        inews_site = savestr("");
+        inews_site = save_str("");
     }
     std::free(sitebuf);
 

libtrn/cache.cpp

@@ -541,7 +541,7 @@ void set_subj_line(Article *ap, char *subj, int size)
     }
     if (subj_start != newsubj + 4)
     {
-        safecpy(newsubj + 4, subj_start, size);
+        safe_copy(newsubj + 4, subj_start, size);
         if ((size -= subj_start - newsubj - 4) < 0)
         {
             size = 0;

libtrn/charsubst.cpp

@@ -207,7 +207,7 @@ int str_char_subst(char *outb, const char *inb, int limit, char_int subst)
     {
         len = std::strlen(inb);
     }
-    safecpy(outb, inb, limit);
+    safe_copy(outb, inb, limit);
     return len;
 }
 

libtrn/datasrc.cpp

@@ -116,7 +116,7 @@ void data_source_init()
 
     g_data_source_list = new_list(0,0,sizeof(DataSource),20,LF_ZERO_MEM,nullptr);
 
-    g_nntp_auth_file = filexp(NNTP_AUTH_FILE);
+    g_nntp_auth_file = file_exp(NNTP_AUTH_FILE);
 
     char *machine = get_val("NNTPSERVER");
     if (machine && std::strcmp(machine,"local") != 0)
@@ -141,7 +141,7 @@ void data_source_init()
 
     if (!machine)
     {
-        machine = filexp(SERVER_NAME);
+        machine = file_exp(SERVER_NAME);
         if (FILE_REF(machine))
         {
             machine = nntp_server_name(machine);
@@ -195,7 +195,7 @@ char *read_data_sources(const char *filename)
     char* filebuf = nullptr;
     char** vals = ini_values(s_datasrc_ini);
 
-    int fd = open(filexp(filename), 0);
+    int fd = open(file_exp(filename), 0);
     if (fd >= 0)
     {
         stat_t datasrc_stat{};
@@ -284,7 +284,7 @@ static DataSource *new_datasrc(const char *name, char **vals)
     }
     else
     {
-        dp->news_id = save_str(filexp(vals[DI_ACTIVE_FILE]));
+        dp->news_id = save_str(file_exp(vals[DI_ACTIVE_FILE]));
     }
 
     dp->spool_dir = file_or_none(vals[DI_SPOOL_DIR]);
@@ -302,7 +302,7 @@ static DataSource *new_datasrc(const char *name, char **vals)
         /* FYI, we know extra_name to be nullptr in this case. */
         if (vals[DI_ACTIVE_FILE])
         {
-            dp->extra_name = save_str(filexp(vals[DI_ACTIVE_FILE]));
+            dp->extra_name = save_str(file_exp(vals[DI_ACTIVE_FILE]));
             stat_t extra_stat{};
             if (stat(dp->extra_name,&extra_stat) >= 0)
             {
@@ -412,7 +412,7 @@ static char *dir_or_none(DataSource *dp, const char *dir, DataSourceFlags flag)
     }
 
     dp->flags |= flag;
-    dir = filexp(dir);
+    dir = file_exp(dir);
     if (!std::strcmp(dir,dp->spool_dir))
     {
         return dp->spool_dir;
@@ -426,7 +426,7 @@ static char *file_or_none(char *fn)
     {
         return nullptr;
     }
-    return save_str(filexp(fn));
+    return save_str(file_exp(fn));
 }
 
 bool open_data_source(DataSource *dp)

libtrn/head.cpp

@@ -202,7 +202,7 @@ HeaderLineType get_header_num(char *s)
         {
             std::free(g_htype[CUSTOM_LINE].name);
         }
-        g_htype[CUSTOM_LINE].name = savestr(g_msg);
+        g_htype[CUSTOM_LINE].name = save_str(g_msg);
         g_htype[CUSTOM_LINE].length = end - s;
         g_htype[CUSTOM_LINE].flags = g_htype[i].flags;
         g_htype[CUSTOM_LINE].min_pos = -1;
@@ -283,7 +283,7 @@ void end_header_line()
                 else
                 {
                     char* s = safe_malloc(size);
-                    safecpy(s,g_head_buf+start,size);
+                    safe_copy(s,g_head_buf+start,size);
                     set_cached_line(s_parsed_artp,g_in_header,s);
                 }
             }
@@ -503,13 +503,13 @@ char *fetch_lines(ArticleNum art_num, HeaderLineType which_line)
         s = fetch_cache(art_num,which_line, FILL_CACHE);
         if (s)
         {
-            return savestr(s);
+            return save_str(s);
         }
     }
     ArticlePosition firstpos = g_htype[which_line].min_pos;
     if (firstpos < 0)
     {
-        return savestr("");
+        return save_str("");
     }
 
     firstpos += g_htype[which_line].length + 1;
@@ -529,7 +529,7 @@ char *fetch_lines(ArticleNum art_num, HeaderLineType which_line)
     }
 #endif
     s = safe_malloc((MemorySize)size);
-    safecpy(s,t,size);
+    safe_copy(s,t,size);
     return s;
 }
 
@@ -574,7 +574,7 @@ char *mp_fetch_lines(ArticleNum art_num, HeaderLineType which_line, MemoryPool p
     }
 #endif
     s = mp_malloc(size,pool);
-    safecpy(s,t,size);
+    safe_copy(s,t,size);
     return s;
 }
 
@@ -594,7 +594,7 @@ static int nntp_xhdr(HeaderLineType which_line, ArticleNum artnum, ArticleNum la
 
 // ART_NUM artnum   article to get line from */
 // int which_line   type of line desired */
-// bool copy    do you want it savestr()ed? */
+// bool copy    do you want it save_str()ed? */
 char *prefetch_lines(ArticleNum art_num, HeaderLineType which_line, bool copy)
 {
     char* s;
@@ -614,7 +614,7 @@ char *prefetch_lines(ArticleNum art_num, HeaderLineType which_line, bool copy)
         {
             if (copy)
             {
-                s = savestr(s);
+                s = save_str(s);
             }
             return s;
         }
@@ -695,7 +695,7 @@ char *prefetch_lines(ArticleNum art_num, HeaderLineType which_line, bool copy)
                 }
                 else if (cached)
                 {
-                    set_cached_line(ap, which_line, savestr(t));
+                    set_cached_line(ap, which_line, save_str(t));
                 }
                 if (num == art_num)
                 {
@@ -746,7 +746,7 @@ char *prefetch_lines(ArticleNum art_num, HeaderLineType which_line, bool copy)
     {
         if (copy)
         {
-            s = savestr(s);
+            s = save_str(s);
         }
         return s;
     }
@@ -769,6 +769,6 @@ char *prefetch_lines(ArticleNum art_num, HeaderLineType which_line, bool copy)
         s = g_cmd_buf;                  /* really scraping for space here */
         size = std::min(size, static_cast<int>(sizeof g_cmd_buf));
     }
-    safecpy(s,t,size);
+    safe_copy(s,t,size);
     return s;
 }