[Debburn-changes] r539 - in cdrkit/trunk/librols: . stdio
Eduard Bloch
blade at alioth.debian.org
Sat Dec 2 12:17:19 CET 2006
Author: blade
Date: 2006-12-02 12:17:19 +0100 (Sat, 02 Dec 2006)
New Revision: 539
Removed:
cdrkit/trunk/librols/Targets
cdrkit/trunk/librols/stdio/fgetstr.c
Modified:
cdrkit/trunk/librols/CMakeLists.txt
Log:
Killed some dead code, fgetsstr.c
Modified: cdrkit/trunk/librols/CMakeLists.txt
===================================================================
--- cdrkit/trunk/librols/CMakeLists.txt 2006-12-02 11:11:33 UTC (rev 538)
+++ cdrkit/trunk/librols/CMakeLists.txt 2006-12-02 11:17:19 UTC (rev 539)
@@ -1,7 +1,7 @@
PROJECT (LIBROLS)
INCLUDE_DIRECTORIES(../include ../libhfs_iso ${CMAKE_BINARY_DIR} ../wodim)
-SET(LIBROLS_SRCS astoi.c astoll.c astoull.c breakline.c cmpbytes.c comerr.c error.c fexec.c fillbytes.c getargs.c getav0.c getdomainname.c geterrno.c gethostid.c gethostname.c getpagesize.c handlecond.c movebytes.c raisecond.c rename.c saveargs.c seterrno.c spawn.c strcatl.c strdup.c streql.c swabbytes.c usleep.c stdio/cvmod.c stdio/dat.c stdio/fcons.c stdio/fcons64.c stdio/fdown.c stdio/fdup.c stdio/fdup64.c stdio/ffileread.c stdio/ffilewrite.c stdio/fgetline.c stdio/fgetstr.c stdio/file_raise.c stdio/fileclose.c stdio/fileluopen.c stdio/fileluopen64.c stdio/filemopen.c stdio/filemopen64.c stdio/fileopen.c stdio/fileopen64.c stdio/filepos.c stdio/filepos64.c stdio/fileread.c stdio/filereopen.c stdio/filereopen64.c stdio/fileseek.c stdio/fileseek64.c stdio/filesize.c stdio/filesize64.c stdio/filestat.c stdio/filestat64.c stdio/filewrite.c stdio/flag.c stdio/flush.c stdio/fpipe.c stdio/niread.c stdio/niwrite.c stdio/nixread.c stdio/nixwrite.c stdio/openfd.c stdio/openfd64.c stdio/peekc.c )
+SET(LIBROLS_SRCS astoi.c astoll.c astoull.c breakline.c cmpbytes.c comerr.c error.c fexec.c fillbytes.c getargs.c getav0.c getdomainname.c geterrno.c gethostid.c gethostname.c getpagesize.c handlecond.c movebytes.c raisecond.c rename.c saveargs.c seterrno.c spawn.c strcatl.c strdup.c streql.c swabbytes.c usleep.c stdio/cvmod.c stdio/dat.c stdio/fcons.c stdio/fcons64.c stdio/fdown.c stdio/fdup.c stdio/fdup64.c stdio/ffileread.c stdio/ffilewrite.c stdio/fgetline.c stdio/file_raise.c stdio/fileclose.c stdio/fileluopen.c stdio/fileluopen64.c stdio/filemopen.c stdio/filemopen64.c stdio/fileopen.c stdio/fileopen64.c stdio/filepos.c stdio/filepos64.c stdio/fileread.c stdio/filereopen.c stdio/filereopen64.c stdio/fileseek.c stdio/fileseek64.c stdio/filesize.c stdio/filesize64.c stdio/filestat.c stdio/filestat64.c stdio/filewrite.c stdio/flag.c stdio/flush.c stdio/fpipe.c stdio/niread.c stdio/niwrite.c stdio/nixread.c stdio/nixwrite.c stdio/openfd.c stdio/openfd64.c stdio/peekc.c )
ADD_LIBRARY (rols STATIC ${CMAKE_CURRENT_SOURCE_DIR}/../include/xconfig.h ${CMAKE_CURRENT_SOURCE_DIR}/../include/align.h ${LIBROLS_SRCS})
Deleted: cdrkit/trunk/librols/Targets
===================================================================
--- cdrkit/trunk/librols/Targets 2006-12-02 11:11:33 UTC (rev 538)
+++ cdrkit/trunk/librols/Targets 2006-12-02 11:17:19 UTC (rev 539)
@@ -1,35 +0,0 @@
-CFILES_STDIO= cvmod.c dat.c fcons.c fdown.c fdup.c \
- ffileread.c ffilewrite.c \
- fgetline.c fgetstr.c file_raise.c \
- fileclose.c fileluopen.c fileopen.c filemopen.c \
- filepos.c fileread.c filereopen.c fileseek.c filesize.c \
- filestat.c filewrite.c flag.c flush.c fpipe.c \
- niread.c niwrite.c nixread.c nixwrite.c openfd.c peekc.c \
- fcons64.c fdup64.c fileluopen64.c fileopen64.c filemopen64.c \
- filepos64.c filereopen64.c fileseek64.c filesize64.c \
- filestat64.c openfd64.c
-
-#
-# Note: getfp.c must be before getav0.c
-# Otherwise getfp.o would be made as dependency of avoffset
-#
-
-CFILES_REST= astoi.c astoll.c astoull.c breakline.c \
- comerr.c cmpbytes.c cmpnullbytes.c \
- error.c \
- fconv.c fexec.c fillbytes.c \
- findbytes.c findline.c format.c \
- getargs.c getav0.c geterrno.c getfp.c \
- getdomainname.c gethostid.c gethostname.c getpagesize.c \
- handlecond.c \
- jsprintf.c jssnprintf.c jssprintf.c \
- match.c matchl.c movebytes.c \
- printf.c \
- raisecond.c rename.c \
- saveargs.c serrmsg.c seterrno.c setfp.c \
- snprintf.c spawn.c \
- sprintf.c strcatl.c strdup.c streql.c \
- swabbytes.c \
- usleep.c
-
-CFILES= $(CFILES_STDIO) $(CFILES_REST)
Deleted: cdrkit/trunk/librols/stdio/fgetstr.c
===================================================================
--- cdrkit/trunk/librols/stdio/fgetstr.c 2006-12-02 11:11:33 UTC (rev 538)
+++ cdrkit/trunk/librols/stdio/fgetstr.c 2006-12-02 11:17:19 UTC (rev 539)
@@ -1,75 +0,0 @@
-/*
- * This file has been modified for the cdrkit suite.
- *
- * The behaviour and appearence of the program code below can differ to a major
- * extent from the version distributed by the original author(s).
- *
- * For details, see Changelog file distributed with the cdrkit package. If you
- * received this file from another source then ask the distributing person for
- * a log of modifications.
- *
- */
-
-/* @(#)fgetstr.c 1.9 04/09/25 Copyright 1986, 1996-2003 J. Schilling */
-/*
- * Copyright (c) 1986, 1996-2003 J. Schilling
- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; see the file COPYING. If not, write to the Free Software
- * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include "schilyio.h"
-
-/*
- * XXX should we check if HAVE_USG_STDIO is defined and
- * XXX use something line memccpy to speed things up ???
- */
-
-EXPORT int
-fgetstr(f, buf, len)
- register FILE *f;
- char *buf;
- register int len;
-{
- register int c = '\0';
- register char *bp = buf;
- register int nl = '\n';
-
- down2(f, _IOREAD, _IORW);
-
- for (;;) {
- if ((c = getc(f)) < 0)
- break;
- if (--len > 0)
- *bp++ = (char)c;
- if (c == nl)
- break;
- }
- *bp = '\0';
- /*
- * If buffer is empty and we hit EOF, return EOF
- */
- if (c < 0 && bp == buf)
- return (c);
-
- return (bp - buf);
-}
-
-EXPORT int
-getstr(buf, len)
- char *buf;
- int len;
-{
- return (fgetstr(stdin, buf, len));
-}
More information about the Debburn-changes
mailing list