[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freewrt-commits
Subject:    [FreeWRT-commits] r3904 - trunk/freewrt/tools/paxmirabilis
From:       tg () freewrt ! org
Date:       2009-11-22 22:16:54
Message-ID: 20091122221654.8B52F1C004 () frozenfish ! freewrt ! org
[Download RAW message or body]

Author: tg
Date: 2009-11-22 23:16:53 +0100 (Sun, 22 Nov 2009)
New Revision: 3904

Modified:
   trunk/freewrt/tools/paxmirabilis/fgetln.c
   trunk/freewrt/tools/paxmirabilis/strlfun.c
   trunk/freewrt/tools/paxmirabilis/strmode.c
Log:
since FreeWRT still uses Suckwürstchen, which hasn't managed in
how-many-years to get RCS IDs, the master copies of these files
shall henceforth be in the MirCVS Repository; merge from there.


Modified: trunk/freewrt/tools/paxmirabilis/fgetln.c
===================================================================
--- trunk/freewrt/tools/paxmirabilis/fgetln.c	2009-11-22 21:40:50 UTC (rev 3903)
+++ trunk/freewrt/tools/paxmirabilis/fgetln.c	2009-11-22 22:16:53 UTC (rev 3904)
@@ -1,8 +1,6 @@
-/* $FreeWRT: contrib/code/mirmake/dist/contrib/fgetln.c,v 1.5 2009/05/20 10:40:28 tg Exp $ */
-
 /*-
- * Copyright (c) 2007
- *	Thorsten Glaser <tg@mirbsd.de>
+ * Copyright (c) 2007, 2009
+ *	Thorsten Glaser <tg@mirbsd.org>
  *
  * Provided that these terms and disclaimer and all copyright notices
  * are retained or reproduced in an accompanying document, permission
@@ -27,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-__RCSID("$MirOS: contrib/code/mirmake/dist/contrib/fgetln.c,v 1.5 2009/05/20 10:40:28 tg Exp $");
+__RCSID("$MirOS: contrib/code/mirmake/dist/contrib/fgetln.c,v 1.6 2009/11/21 14:50:27 tg Exp $");
 
 #if defined(__GLIBC__)
 
@@ -42,6 +40,7 @@
 	static size_t lbsz = 0;
 
 	if ((*len = getline(&lb, &lbsz, stream)) != (size_t)-1)
+		/* getdelim ensures *len is not 0 here */
 		return (lb);
 
 	/* not required by manpage, but reference implementation does this */

Modified: trunk/freewrt/tools/paxmirabilis/strlfun.c
===================================================================
--- trunk/freewrt/tools/paxmirabilis/strlfun.c	2009-11-22 21:40:50 UTC (rev 3903)
+++ trunk/freewrt/tools/paxmirabilis/strlfun.c	2009-11-22 22:16:53 UTC (rev 3904)
@@ -74,7 +74,7 @@
 #endif
 
 #if !defined(_KERNEL) && !defined(_STANDALONE)
-__RCSID("$MirOS: src/lib/libc/string/strlfun.c,v 1.18 2008/08/01 12:26:17 tg Exp $");
+__RCSID("$MirOS: contrib/code/jupp/strlfun.c,v 1.9 2008/08/01 12:29:27 tg Rel $");
 #endif
 
 /* (multibyte) string functions */

Modified: trunk/freewrt/tools/paxmirabilis/strmode.c
===================================================================
--- trunk/freewrt/tools/paxmirabilis/strmode.c	2009-11-22 21:40:50 UTC (rev 3903)
+++ trunk/freewrt/tools/paxmirabilis/strmode.c	2009-11-22 22:16:53 UTC (rev 3904)
@@ -32,8 +32,6 @@
 #include <sys/stat.h>
 #include <string.h>
 
-void strmode(mode_t, char *);
-
 void
 strmode(mode_t mode, char *p)
 {

_______________________________________________
freewrt-commits mailing list
freewrt-commits@freewrt.org
https://www.freewrt.org/lists/listinfo/freewrt-commits

[prev in list] [next in list] [prev in thread] [next in thread]