[27203] in Source-Commits
/svn/athena r26014 - in trunk/third: lam rs
daemon@ATHENA.MIT.EDU (Alexander Chernyakhovsky)
Thu May 30 03:52:36 2013
Date: Thu, 30 May 2013 03:52:28 -0400
From: Alexander Chernyakhovsky <achernya@MIT.EDU>
Message-Id: <201305300752.r4U7qSmx007110@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: achernya
Date: 2013-05-30 03:52:28 -0400 (Thu, 30 May 2013)
New Revision: 26014
Modified:
trunk/third/lam/lam.c
trunk/third/rs/rs.c
Log:
Patches are hard
Modified: trunk/third/lam/lam.c
===================================================================
--- trunk/third/lam/lam.c 2013-05-30 07:49:35 UTC (rev 26013)
+++ trunk/third/lam/lam.c 2013-05-30 07:52:28 UTC (rev 26014)
@@ -39,6 +39,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
/*
* lam - laminate files
@@ -50,7 +51,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <bsd/string.h>
#define MAXOFILES 20
#define BIGBUFSIZ 5 * BUFSIZ
Modified: trunk/third/rs/rs.c
===================================================================
--- trunk/third/rs/rs.c 2013-05-30 07:49:35 UTC (rev 26013)
+++ trunk/third/rs/rs.c 2013-05-30 07:52:28 UTC (rev 26014)
@@ -44,6 +44,7 @@
*/
#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
#include <err.h>
#include <ctype.h>
@@ -92,7 +93,7 @@
static void getargs(int, char *[]);
static void getfile(void);
-static int rs_getline(void);
+static int getline(void);
static char *getlist(short **, char *);
static char *getnum(int *, char *, int);
static char **getptrs(char **);
@@ -132,13 +133,13 @@
char **padto;
while (skip--) {
- c = rs_getline();
+ c = getline();
if (flags & SKIPPRINT)
puts(curline);
if (c == EOF)
return;
}
- rs_getline();
+ getline();
if (flags & NOARGS && curlen < owidth)
flags |= ONEPERLINE;
if (flags & ONEPERLINE)
@@ -183,7 +184,7 @@
INCR(ep);
}
}
- } while (rs_getline() != EOF);
+ } while (getline() != EOF);
*ep = 0; /* mark end of pointers */
nelem = ep - elem;
}
@@ -332,7 +333,7 @@
static char ibuf[BSIZE];
static int
-rs_getline(void) /* get line; maintain curline, curlen; manage storage */
+getline(void) /* get line; maintain curline, curlen; manage storage */
{
static int putlength;
static char *endblock = ibuf + BSIZE;
