less horrible strncpy's

[apps/madmutt.git] / thread.c

diff --git a/thread.c b/thread.c
index 1bf0b5f..dc786bb 100644 (file)
--- a/thread.c
+++ b/thread.c
@@ -124,7 +124,7 @@ static void calculate_visibility (CONTEXT * ctx, int *max_depth)
     tree = tree->next;
   *max_depth = 0;
 
-  FOREVER {
+  for (;;) {
     if (depth > *max_depth)
       *max_depth = depth;
 
@@ -180,7 +180,7 @@ static void calculate_visibility (CONTEXT * ctx, int *max_depth)
   /* now fix up for the OPTHIDETOP* options if necessary */
   if (hide_top_limited || hide_top_missing) {
     tree = ctx->tree;
-    FOREVER {
+    for (;;) {
       if (!tree->visible && tree->deep && tree->subtree_visible < 2
           && ((tree->message && hide_top_limited)
               || (!tree->message && hide_top_missing)))
@@ -243,7 +243,7 @@ void mutt_draw_tree (CONTEXT * ctx)
         myarrow[width + 1] = 0;
         new_tree = p_new(char, (2 + depth * width));
         if (start_depth > 1) {
-          strncpy (new_tree, pfx, (start_depth - 1) * width);
+          memcpy(new_tree, pfx, (start_depth - 1) * width);
           strfcpy (new_tree + (start_depth - 1) * width,
                    arrow, (1 + depth - start_depth) * width + 2);
         }
@@ -324,7 +324,7 @@ static LIST *make_subject_list (THREAD * cur, time_t * dateptr)
   LIST *curlist, *oldlist, *newlist, *subjects = NULL;
   int rc = 0;
 
-  FOREVER {
+  for (;;) {
     while (!cur->message)
       cur = cur->child;
 
@@ -463,7 +463,7 @@ static void pseudo_threads (CONTEXT * ctx)
       insert_message (&parent->child, parent, cur);
       parent->sort_children = 1;
       tmp = cur;
-      FOREVER {
+      for (;;) {
         while (!tmp->message)
           tmp = tmp->child;
 
@@ -899,7 +899,7 @@ static HEADER *find_virtual (THREAD * cur, int reverse)
   while (reverse && cur->next)
     cur = cur->next;
 
-  FOREVER {
+  for (;;) {
     if (cur->message && cur->message->virtual >= 0)
       return (cur->message);
 
@@ -1081,7 +1081,7 @@ int _mutt_traverse_thread (CONTEXT * ctx, HEADER * cur, int flag)
       return (min_unread);
   }
 
-  FOREVER {
+  for (;;) {
     cur = thread->message;
 
     if (cur) {