--- fenglin/lib/str_process.inc.php	2025/03/26 07:09:08	1.12
+++ fenglin/lib/str_process.inc.php	2025/04/07 06:26:44	1.15
@@ -1,5 +1,5 @@
 <?
-function str_length($str)
+function str_length(string $str) : string
 {
 	$len = strlen($str);
 	$ret = 0;
@@ -32,10 +32,12 @@ function str_length($str)
 	return $ret;
 }
 
-function split_line($str, $prefix = "", $width = 76, $lines_limit = PHP_INT_MAX)
+function split_line(string $str, string $prefix = "", int $width = 76, int $lines_limit = PHP_INT_MAX, string $end_of_line = "\n") : string
 {
 	if ($width <= 0)
+	{
 		return $str;
+	}
 	
 	$result = "";
 	$len = strlen($str);
@@ -57,7 +59,12 @@ function split_line($str, $prefix = "",
 				
 		if ($c == "\n")
 		{
-			$result .= ($line . "\n");
+			if ($lines_count + 1 >= $lines_limit)
+			{
+				break;
+			}
+
+			$result .= ($line . $end_of_line);
 			$lines_count++;
 			$line = $prefix;
 			$line_len = $prefix_len;
@@ -85,7 +92,7 @@ function split_line($str, $prefix = "",
 					break;
 				}
 
-				$result .= ($line . "\n");
+				$result .= ($line . $end_of_line);
 				$lines_count++;
 				$line = $prefix;
 				$line_len = $prefix_len;
@@ -97,20 +104,20 @@ function split_line($str, $prefix = "",
 			$line_len++;
 		}
 
-		$line .= $c;
-
-		if ($line_len >= $width)
+		if ($line_len > $width)
 		{
 			if ($lines_count + 1 >= $lines_limit)
 			{
 				break;
 			}
 
-			$result .= ($line . "\n");
+			$result .= ($line . $end_of_line);
 			$lines_count++;
 			$line = $prefix;
-			$line_len = $prefix_len;
+			$line_len = $prefix_len + 1;
 		}
+
+		$line .= $c;
 	}
 
 	if ($lines_count < $lines_limit)