Always use c2pstrcpy in stead of c2pstr, not only when compiling for carbon.

diff --git a/Mac/Compat/getwd.c b/Mac/Compat/getwd.c
index df96d42b936dd97b401d14a52ef2136c7a9c3f26..738d7563614f49b1c2868960c14877de6fdc3a8f 100644 (file)
--- a/Mac/Compat/getwd.c
+++ b/Mac/Compat/getwd.c
@@ -53,12 +53,8 @@ getwd(char *cwd)
                sprintf(cwd, "I/O error %d in PBHGetVolSync", err);
                return NULL;
        }
-#if TARGET_API_MAC_CARBON
        p2cstrcpy(cwd, (StringPtr)cwd);
        ecwd = strchr(cwd, EOS);
-#else
-       ecwd= strchr((const char *)p2cstr((unsigned char*)cwd), EOS);
-#endif
        ebuf= buf;
        *ebuf = EOS;
        
@@ -77,12 +73,8 @@ getwd(char *cwd)
                                return NULL;
                        }
                        dirid= pb.d.ioDrParID;
-#if TARGET_API_MAC_CARBON
                        p2cstrcpy(ebuf, (StringPtr)ebuf);
                        ebuf += strlen(ebuf);
-#else
-                       ebuf += strlen((const char *)p2cstr((unsigned char *)ebuf));
-#endif
                        /* Should check for buf overflow */
                }
        }