Resolved conflict and removed adaptation for strpbrk for time being.

diff --git a/libsrc/apple2/extra/iobuf-0800.s b/libsrc/apple2/extra/iobuf-0800.s
index c7a9dae2e22a80a2239207c91202178e3e79ab7d..694b91fdbe965c1b146d9cd3b2d2924f4f0deb8d 100644 (file)
--- a/libsrc/apple2/extra/iobuf-0800.s
+++ b/libsrc/apple2/extra/iobuf-0800.s
@@ -7,7 +7,7 @@
 
         .constructor    initiobuf
         .export         iobuf_alloc, iobuf_free
-        .import         __STARTUP_RUN__
+        .import         __MAIN_START__
         .import         incsp2, popptr1
 
         .include        "zeropage.inc"
@@ -18,7 +18,7 @@
 
 initiobuf:
         ; Convert end address highbyte to table index
-        lda     #>__STARTUP_RUN__
+        lda     #>__MAIN_START__
         sec
         sbc     #>$0800
         lsr

diff --git a/libsrc/common/strpbrk.s b/libsrc/common/strpbrk.s
index afe90ecabdca753e25b26ba77a3a921452814071..5d1482913d73f0366f8707de12bb0b8e7c601b18 100644 (file)
--- a/libsrc/common/strpbrk.s
+++ b/libsrc/common/strpbrk.s
@@ -5,15 +5,17 @@
 ;
 
         .export         _strpbrk
-        .import         popax, popptr1, return0
+        .import         popax, return0
         .importzp       ptr1, ptr2, tmp1, tmp2, tmp3
 
 _strpbrk:
         jsr     popax           ; get s2
         sta     ptr2
         stx     ptr2+1
-        jsr     popptr1         ; get s1
-        ; ldy     #$00           Y=0 guaranteed by popptr1
+        jsr     popax           ; get s1
+        sta     ptr1
+        stx     ptr1+1
+        ldy     #$00
 
 L1:     lda     (ptr1),y        ; get next char from s1
         beq     L9              ; jump if done