patches/dvgrab-05-strsep.diff
author drdoug007
Tue, 04 Sep 2007 07:22:46 +0000
changeset 445 8739b4d845c1
permissions -rw-r--r--
2007-09-04 Doug Scott <[email protected]> * SFElibraw1394.spec: *NEW* Interface to IEEE-1394 subsystem - requires raw1394 driver for Solaris (in progress) * SFEdvgrab.spec: *NEW* DV grabbing utility * SFElibavc1394.spec: *NEW* interface to the 1394 AV/C specification * SFElibiec61883.spec: *NEW* Streaming library for IEEE1394 * SFEdocbook-utils.spec: Fixed typo * base-specs/libraw1394.spec: base spec * base-specs/libiec61883.spec: base spec * base-specs/dvgrab.spec: base spec * base-specs/libavc1394.spec: base spec * patches/dvgrab-04-sunpro.diff: Sun Studio patch * patches/libraw1394-01-configure.diff: configure patch * patches/libavc1394-01-wall.diff: remove -Wall * patches/dvgrab-02-v4l2.diff: patch for Solaris v4l2 * patches/libraw1394-02-u_int.diff: add u_intX_t types * patches/dvgrab-03-u_int.diff: add u_intX_t types * patches/dvgrab-01-configure.diff: configure patch * patches/libraw1394-04-eremoteio.diff: change EREMOTEIO to EIO * patches/dvgrab-06-return.diff: add return * patches/libiec61883-01-function.diff: Change __FUNCTION__ to __func__ * patches/libraw1394-03-kernel.diff: Initial raw1394 port defns * patches/libiec61883-02-struct.diff: gccism * patches/dvgrab-05-strsep.diff: Add strsep function * include/byteswap-compat.h: Fix Sun CXX asm issues
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
445
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     1
--- dvgrab-3.0/dvgrab.cc.orig	2007-09-04 12:43:17.221892690 +0700
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     2
+++ dvgrab-3.0/dvgrab.cc	2007-09-04 12:45:03.704249501 +0700
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     3
@@ -57,6 +57,23 @@
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     4
 Frame *DVgrab::m_frame;
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     5
 FileHandler *DVgrab::m_writer;
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     6
 
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     7
+extern "C" {
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     8
+
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     9
+char * strsep(char **str, const char *delim)
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    10
+{
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    11
+    char *ret = *str;
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    12
+    if(*str == NULL) return NULL;
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    13
+    *str = *str + strcspn(*str, delim);
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    14
+    if(**str == 0) *str = NULL;
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    15
+    else{
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    16
+        **str = 0;
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    17
+        (*str)++;
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    18
+    }
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    19
+    return ret;
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    20
+}
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    21
+
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    22
+}
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    23
+
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    24
 DVgrab::DVgrab( int argc, char *argv[] ) :
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    25
 		m_program_name( argv[0] ), m_port( -1 ), m_node( -1 ), m_reader_active( false ), m_autosplit( false ),
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    26
 		m_timestamp( false ), m_channel( DEFAULT_CHANNEL ), m_frame_count( DEFAULT_FRAMES ),