[Debburn-changes] r584 - in cdrkit/trunk: genisoimage icedax
libdeflt librols netscsid readom wodim
Eduard Bloch
blade at alioth.debian.org
Fri Dec 8 11:15:58 CET 2006
Author: blade
Date: 2006-12-08 11:15:57 +0100 (Fri, 08 Dec 2006)
New Revision: 584
Added:
cdrkit/trunk/librols/default.c
Removed:
cdrkit/trunk/libdeflt/default.c
Modified:
cdrkit/trunk/genisoimage/CMakeLists.txt
cdrkit/trunk/icedax/CMakeLists.txt
cdrkit/trunk/libdeflt/CMakeLists.txt
cdrkit/trunk/librols/CMakeLists.txt
cdrkit/trunk/netscsid/CMakeLists.txt
cdrkit/trunk/readom/CMakeLists.txt
cdrkit/trunk/wodim/CMakeLists.txt
Log:
Moving deflt.c to librols, no point in having a lib for just one file
Modified: cdrkit/trunk/genisoimage/CMakeLists.txt
===================================================================
--- cdrkit/trunk/genisoimage/CMakeLists.txt 2006-12-08 10:07:31 UTC (rev 583)
+++ cdrkit/trunk/genisoimage/CMakeLists.txt 2006-12-08 10:15:57 UTC (rev 584)
@@ -37,13 +37,13 @@
#SET_SOURCE_FILES_PROPERTIES(${MKISOFS_MOST_SRCS} PROPERTIES )
-LINK_DIRECTORIES(../libhfs_iso ../librols ../libusal ../libunls ../libdeflt ../wodim)
+LINK_DIRECTORIES(../libhfs_iso ../librols ../libusal ../libunls ../wodim)
ADD_EXECUTABLE (genisoimage genisoimage.c ${MKISOFS_MOST_SRCS})
-TARGET_LINK_LIBRARIES(genisoimage wodimstuff hfs_iso deflt ${MAGICLIBS} c unls z ${EXTRA_LIBICONV} ${EXTRA_LIBS})
+TARGET_LINK_LIBRARIES(genisoimage wodimstuff hfs_iso ${MAGICLIBS} c unls z ${EXTRA_LIBICONV} ${EXTRA_LIBS})
# common lib set and genisoimage source parts for the rest
-LINK_LIBRARIES(wodimstuff ${EXTRA_LIBS} deflt unls ${EXTRA_LIBICONV} )
+LINK_LIBRARIES(wodimstuff ${EXTRA_LIBS} unls ${EXTRA_LIBICONV} )
ADD_EXECUTABLE(devdump diag/dump.c scsi.c)
ADD_EXECUTABLE(isodebug diag/isodebug.c scsi.c)
ADD_EXECUTABLE(isodump diag/isodump.c scsi.c)
Modified: cdrkit/trunk/icedax/CMakeLists.txt
===================================================================
--- cdrkit/trunk/icedax/CMakeLists.txt 2006-12-08 10:07:31 UTC (rev 583)
+++ cdrkit/trunk/icedax/CMakeLists.txt 2006-12-08 10:15:57 UTC (rev 584)
@@ -13,12 +13,12 @@
ADD_DEFINITIONS(-DHAVE_LINUX_SOUNDCARD_H)
ENDIF(HAVE_LINUX_SOUNDCARD_H)
-LIST(APPEND EXTRA_LIBS deflt paranoia)
+LIST(APPEND EXTRA_LIBS paranoia)
IF (WIN32)
LIST(APPEND EXTRA_LIBS winmm)
ENDIF (WIN32)
-LINK_DIRECTORIES(../librols ../libusal ../libdeflt ../libparanoia)
+LINK_DIRECTORIES(../librols ../libusal ../libparanoia)
ADD_EXECUTABLE (icedax aifc.c aiff.c base64.c icedax.c interface.c ioctl.c md5c.c raw.c resample.c ringbuff.c scsi_cmds.c semshm.c setuid.c sha_func.c sndconfig.c sun.c toc.c wav.c)
TARGET_LINK_LIBRARIES(icedax wodimstuff ${EXTRA_LIBS})
SET_TARGET_PROPERTIES(icedax PROPERTIES SKIP_BUILD_RPATH TRUE)
Modified: cdrkit/trunk/libdeflt/CMakeLists.txt
===================================================================
--- cdrkit/trunk/libdeflt/CMakeLists.txt 2006-12-08 10:07:31 UTC (rev 583)
+++ cdrkit/trunk/libdeflt/CMakeLists.txt 2006-12-08 10:15:57 UTC (rev 584)
@@ -1,7 +1,7 @@
-PROJECT (LIBdeflt)
-INCLUDE_DIRECTORIES(../include ../libhfs_iso ${CMAKE_BINARY_DIR} ../wodim)
-ADD_DEFINITIONS(-DHAVE_CONFIG_H)
-
-SET(LIBdeflt_SRCS default.c)
-
-ADD_LIBRARY (deflt STATIC ${LIBdeflt_SRCS})
+#PROJECT (LIB)
+#INCLUDE_DIRECTORIES(../include ../libhfs_iso ${CMAKE_BINARY_DIR} ../wodim)
+#ADD_DEFINITIONS(-DHAVE_CONFIG_H)
+#
+#SET(LIB_SRCS default.c)
+#
+#ADD_LIBRARY ( STATIC ${LIB_SRCS})
Deleted: cdrkit/trunk/libdeflt/default.c
===================================================================
--- cdrkit/trunk/libdeflt/default.c 2006-12-08 10:07:31 UTC (rev 583)
+++ cdrkit/trunk/libdeflt/default.c 2006-12-08 10:15:57 UTC (rev 584)
@@ -1,179 +0,0 @@
-/*
- * Copyright 2006 Eduard Bloch
- *
- * Uses my config parser code and small wrappers to provide the old interface.
- *
- */
-/*
- * 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 <mconfig.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-
-enum parstate {
- KEYBEGINSEARCH,
- KEYCOMPARE,
- EQSIGNSEARCH,
- VALBEGINSEARCH,
- LASTCHARSEARCH
-};
-
-#define GETVAL_BUF_LEN 512
-#define isUspace(x) isspace( (int) (unsigned char) x)
-
-static FILE *glob_cfg_ptr = NULL;
-
-/*
- * Warning, uses static line buffer, not reentrant. NULL returned if the key isn't found.
- */
-static char *get_value(FILE *srcfile, const char *key, int dorewind) {
- static char linebuf[GETVAL_BUF_LEN];
-
- if(!srcfile)
- return ((char *) NULL);
-
- if(dorewind)
- rewind(srcfile);
-
- if(!key)
- return NULL;
-
-next_line:
- while(fgets(linebuf, sizeof(linebuf)-1, srcfile)) {
- int i;
- int keybeg;
- int s=KEYBEGINSEARCH;
- char *ret=NULL;
- int lastchar=0;
-
- /* simple state machine, char position moved by the states (or not),
- * state change is done by the state (or not) */
- for( i=0 ; i<sizeof(linebuf) ; ) {
- /* printf("key: %s, %s, s: %d\n", key, linebuf, s); */
- switch(s) {
- case(KEYBEGINSEARCH):
- {
- if(isUspace(linebuf[i]))
- i++;
- else if(linebuf[i] == '#' || linebuf[i]=='\0')
- goto next_line;
- else {
- s=KEYCOMPARE;
- keybeg=i;
- }
- }
- break;
- case(KEYCOMPARE): /* compare the key */
- {
- if(key[i-keybeg]=='\0')
- /* end of key, next state decides what to do on this position */
- s=EQSIGNSEARCH;
- else {
- if(linebuf[i-keybeg]!=key[i-keybeg])
- goto next_line;
- else
- i++;
- }
- }
- break;
- case(EQSIGNSEARCH): /* skip whitespace, stop on =, break on anything else */
- {
- if(isUspace(linebuf[i]))
- i++;
- else if(linebuf[i]=='=') {
- s=VALBEGINSEARCH;
- i++;
- }
- else
- goto next_line;
- }
- break;
- case(VALBEGINSEARCH):
- {
- if(isUspace(linebuf[i]))
- i++;
- else {
- /* possible at EOF */
- if(linebuf[i] == '\0')
- return NULL;
-
- lastchar=i-1; /* lastchar can be a space, see below */
- ret= & linebuf[i];
- s=LASTCHARSEARCH;
- }
- }
- break;
- case(LASTCHARSEARCH):
- {
- if(linebuf[i]) {
- if(!isUspace(linebuf[i]))
- lastchar=i;
- }
- else { /* got string end, terminate after the last seen char */
- if(linebuf+lastchar < ret) /* no non-space found */
- return NULL;
- linebuf[lastchar+1]='\0';
- return ret;
- }
- i++;
- }
- break;
- }
- }
- }
- return NULL;
-}
-
-int cfg_open(const char *name)
-{
- if(glob_cfg_ptr) {
- fclose(glob_cfg_ptr);
- glob_cfg_ptr=NULL;
- }
- if(!name) {
- glob_cfg_ptr=NULL;
- return 0;
- }
- glob_cfg_ptr = fopen(name, "r");
- return (glob_cfg_ptr ? 0 : -1);
-}
-
-int cfg_close()
-{
- int r;
- if(!glob_cfg_ptr)
- return 0;
- r=fclose(glob_cfg_ptr);
- glob_cfg_ptr=NULL;
- return r;
-}
-
-void cfg_restart()
-{
- get_value(glob_cfg_ptr, NULL, 1);
-}
-
-char *cfg_get(const char *key)
-{
- return get_value(glob_cfg_ptr, key, 1);
-}
-
-char *cfg_get_next(const char *key)
-{
- return get_value(glob_cfg_ptr, key, 0);
-}
Modified: cdrkit/trunk/librols/CMakeLists.txt
===================================================================
--- cdrkit/trunk/librols/CMakeLists.txt 2006-12-08 10:07:31 UTC (rev 583)
+++ cdrkit/trunk/librols/CMakeLists.txt 2006-12-08 10:15:57 UTC (rev 584)
@@ -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/fdown.c stdio/fdup.c stdio/ffileread.c stdio/ffilewrite.c stdio/fgetline.c stdio/file_raise.c stdio/fileclose.c stdio/fileluopen.c stdio/filemopen.c stdio/fileopen.c stdio/filepos.c stdio/fileread.c stdio/filereopen.c stdio/fileseek.c stdio/filesize.c stdio/filestat.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/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/fdown.c stdio/fdup.c stdio/ffileread.c stdio/ffilewrite.c stdio/fgetline.c stdio/file_raise.c stdio/fileclose.c stdio/fileluopen.c stdio/filemopen.c stdio/fileopen.c stdio/filepos.c stdio/fileread.c stdio/filereopen.c stdio/fileseek.c stdio/filesize.c stdio/filestat.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/peekc.c default.c)
ADD_LIBRARY (rols STATIC ${CMAKE_CURRENT_SOURCE_DIR}/../include/xconfig.h ${CMAKE_CURRENT_SOURCE_DIR}/../include/align.h ${LIBROLS_SRCS})
Copied: cdrkit/trunk/librols/default.c (from rev 582, cdrkit/trunk/libdeflt/default.c)
Modified: cdrkit/trunk/netscsid/CMakeLists.txt
===================================================================
--- cdrkit/trunk/netscsid/CMakeLists.txt 2006-12-08 10:07:31 UTC (rev 583)
+++ cdrkit/trunk/netscsid/CMakeLists.txt 2006-12-08 10:15:57 UTC (rev 584)
@@ -4,10 +4,10 @@
INCLUDE(../include/AddSchilyBits.cmake)
INCLUDE(../include/AddNetworkBits.cmake)
-LINK_DIRECTORIES(../librols ../libusal ../libdeflt)
+LINK_DIRECTORIES(../librols ../libusal )
ADD_EXECUTABLE (netscsid netscsid.c)
#SET_SOURCE_FILES_PROPERTIES(netscsid.c )
-TARGET_LINK_LIBRARIES(netscsid ${EXTRA_LIBS} deflt)
+TARGET_LINK_LIBRARIES(netscsid ${EXTRA_LIBS} )
#SET_TARGET_PROPERTIES(netscsid PROPERTIES SKIP_BUILD_RPATH TRUE)
INSTALL(TARGETS netscsid DESTINATION sbin)
Modified: cdrkit/trunk/readom/CMakeLists.txt
===================================================================
--- cdrkit/trunk/readom/CMakeLists.txt 2006-12-08 10:07:31 UTC (rev 583)
+++ cdrkit/trunk/readom/CMakeLists.txt 2006-12-08 10:15:57 UTC (rev 584)
@@ -5,12 +5,12 @@
AUX_SOURCE_DIRECTORY(. readom_SRCS)
-LINK_DIRECTORIES(../librols ../libusal ../libdeflt ../wodim)
+LINK_DIRECTORIES(../librols ../libusal ../wodim)
ADD_DEFINITIONS(-DCLONE_WRITE)
ADD_EXECUTABLE (readom ${readom_SRCS})
-TARGET_LINK_LIBRARIES(readom ${EXTRA_LIBS} wodimstuff deflt)
+TARGET_LINK_LIBRARIES(readom wodimstuff ${EXTRA_LIBS})
SET_TARGET_PROPERTIES(readom PROPERTIES SKIP_BUILD_RPATH TRUE)
INSTALL(TARGETS readom DESTINATION bin)
Modified: cdrkit/trunk/wodim/CMakeLists.txt
===================================================================
--- cdrkit/trunk/wodim/CMakeLists.txt 2006-12-08 10:07:31 UTC (rev 583)
+++ cdrkit/trunk/wodim/CMakeLists.txt 2006-12-08 10:15:57 UTC (rev 584)
@@ -19,7 +19,7 @@
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
ENDIF(HAVE_SYS_CAPABILITY_H)
-LINK_DIRECTORIES(../librols ../libusal ../libdeflt ../libedc)
+LINK_DIRECTORIES(../librols ../libusal ../libedc)
ADD_DEFINITIONS(-DHAVE_LIB_EDC_ECC -DCLONE_WRITE)
@@ -27,7 +27,7 @@
ADD_LIBRARY (wodimstuff STATIC ${CDRECORD_COMMON_SRCS})
LIST(APPEND EXTRA_LIBS wodimstuff)
-TARGET_LINK_LIBRARIES(wodim ${EXTRA_LIBS} deflt edc)
+TARGET_LINK_LIBRARIES(wodim ${EXTRA_LIBS} edc)
SET_TARGET_PROPERTIES(wodim PROPERTIES SKIP_BUILD_RPATH TRUE)
INSTALL(TARGETS wodim DESTINATION bin)
More information about the Debburn-changes
mailing list