# HG changeset patch
# User Jonathan Schleifer <js-audacious@webkeks.org>
# Date 1198497675 -3600
# Node ID 7b9d5718a6dcdca1da50b7419a8705b588a24418
# Parent  10e7c823462d03cedc0023be6ce6d623dcc00290
strncpy() -> g_strlcpy()

diff -r 10e7c823462d -r 7b9d5718a6dc src/audacious/formatter.c
--- a/src/audacious/formatter.c	Fri Dec 21 18:39:46 2007 +0100
+++ b/src/audacious/formatter.c	Mon Dec 24 13:01:15 2007 +0100
@@ -126,7 +126,7 @@
     for (p = format, q = buffer; *p; p++)
         if (*p == '%') {
             if (formatter->values[(int) *++p]) {
-                strncpy(q, formatter->values[(int) *p], len - 1);
+                g_strlcpy(q, formatter->values[(int) *p], len - 1);
                 q += strlen(q);
             }
             else {
diff -r 10e7c823462d -r 7b9d5718a6dc src/audacious/intl/localcharset.c
--- a/src/audacious/intl/localcharset.c	Fri Dec 21 18:39:46 2007 +0100
+++ b/src/audacious/intl/localcharset.c	Mon Dec 24 13:01:15 2007 +0100
@@ -186,8 +186,8 @@
 		  res_size = 0;
 		  break;
 		}
-	      strncpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1, res_size - (l2 + 1));
-	      strncpy (res_ptr + res_size - (l2 + 1), buf2, res_size - (l1 + 1));
+	      g_strlcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1, res_size - (l2 + 1));
+	      g_strlcpy (res_ptr + res_size - (l2 + 1), buf2, res_size - (l1 + 1));
 	    }
 	  fclose (fp);
 	  if (res_size == 0)
diff -r 10e7c823462d -r 7b9d5718a6dc src/audacious/intl/log.c
--- a/src/audacious/intl/log.c	Fri Dec 21 18:39:46 2007 +0100
+++ b/src/audacious/intl/log.c	Mon Dec 24 13:01:15 2007 +0100
@@ -81,7 +81,7 @@
       last_logfilename = (char *) malloc (strlen (logfilename) + 1);
       if (last_logfilename == NULL)
 	return;
-      strncpy (last_logfilename, logfilename, strlen(logfilename) + 1);
+      g_strlcpy (last_logfilename, logfilename, strlen(logfilename) + 1);
       last_logfile = fopen (logfilename, "a");
       if (last_logfile == NULL)
 	return;
diff -r 10e7c823462d -r 7b9d5718a6dc src/audacious/intl/os2compat.c
--- a/src/audacious/intl/os2compat.c	Fri Dec 21 18:39:46 2007 +0100
+++ b/src/audacious/intl/os2compat.c	Mon Dec 24 13:01:15 2007 +0100
@@ -94,5 +94,5 @@
     }
 
   if (strlen (_nlos2_localedir) <= MAXPATHLEN)
-    strncpy (libintl_nl_default_dirname, _nlos2_localedir, MAXPATHLEN + 1);
+    g_strlcpy (libintl_nl_default_dirname, _nlos2_localedir, MAXPATHLEN + 1);
 }
diff -r 10e7c823462d -r 7b9d5718a6dc src/audacious/intl/relocatable.c
--- a/src/audacious/intl/relocatable.c	Fri Dec 21 18:39:46 2007 +0100
+++ b/src/audacious/intl/relocatable.c	Mon Dec 24 13:01:15 2007 +0100
@@ -427,7 +427,7 @@
 #endif
 	    {
 	      memcpy (result, curr_prefix, curr_prefix_len);
-	      strncpy (result + curr_prefix_len, pathname_tail, strlen(pathname_tail) + 1);
+	      g_strlcpy (result + curr_prefix_len, pathname_tail, strlen(pathname_tail) + 1);
 	      return result;
 	    }
 	}
diff -r 10e7c823462d -r 7b9d5718a6dc src/audacious/tuple_compiler.c
--- a/src/audacious/tuple_compiler.c	Fri Dec 21 18:39:46 2007 +0100
+++ b/src/audacious/tuple_compiler.c	Mon Dec 24 13:01:15 2007 +0100
@@ -805,7 +805,7 @@
         *resmax = *reslen + MIN_ALLOC_BUF;
         *res = g_malloc(*resmax);
         
-        strncpy(*res, str, *resmax);
+        g_strlcpy(*res, str, *resmax);
       }
     }
     
diff -r 10e7c823462d -r 7b9d5718a6dc src/audacious/ui_equalizer.c
--- a/src/audacious/ui_equalizer.c	Fri Dec 21 18:39:46 2007 +0100
+++ b/src/audacious/ui_equalizer.c	Mon Dec 24 13:01:15 2007 +0100
@@ -1094,7 +1094,7 @@
     vfs_fwrite("Winamp EQ library file v1.1\x1a!--", 1, 31, file);
 
     memset(name, 0, 257);
-    strncpy(name, "Entry1", 257);
+    g_strlcpy(name, "Entry1", 257);
     vfs_fwrite(name, 1, 257, file);
 
     for (i = 0; i < 10; i++)
diff -r 10e7c823462d -r 7b9d5718a6dc src/libid3tag/field.c
--- a/src/libid3tag/field.c	Fri Dec 21 18:39:46 2007 +0100
+++ b/src/libid3tag/field.c	Mon Dec 24 13:01:15 2007 +0100
@@ -78,11 +78,11 @@
     break;
 
   case ID3_FIELD_TYPE_LANGUAGE:
-    strncpy(field->immediate.value, "XXX", sizeof(field->immediate.value));
+    g_strlcpy(field->immediate.value, "XXX", sizeof(field->immediate.value));
     break;
 
   case ID3_FIELD_TYPE_FRAMEID:
-    strncpy(field->immediate.value, "XXXX", sizeof(field->immediate.value));
+    g_strlcpy(field->immediate.value, "XXXX", sizeof(field->immediate.value));
     break;
 
   case ID3_FIELD_TYPE_DATE:
@@ -671,7 +671,7 @@
     if (strlen(language) != 3)
       return -1;
 
-    strncpy(field->immediate.value, language, sizeof(field->immediate.value));
+    g_strlcpy(field->immediate.value, language, sizeof(field->immediate.value));
   }
 
   return 0;