Commit bef8f68d authored by Jack Jansen's avatar Jack Jansen

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

parent 1beb3d20
...@@ -53,12 +53,8 @@ getwd(char *cwd) ...@@ -53,12 +53,8 @@ getwd(char *cwd)
sprintf(cwd, "I/O error %d in PBHGetVolSync", err); sprintf(cwd, "I/O error %d in PBHGetVolSync", err);
return NULL; return NULL;
} }
#if TARGET_API_MAC_CARBON
p2cstrcpy(cwd, (StringPtr)cwd); p2cstrcpy(cwd, (StringPtr)cwd);
ecwd = strchr(cwd, EOS); ecwd = strchr(cwd, EOS);
#else
ecwd= strchr((const char *)p2cstr((unsigned char*)cwd), EOS);
#endif
ebuf= buf; ebuf= buf;
*ebuf = EOS; *ebuf = EOS;
...@@ -77,12 +73,8 @@ getwd(char *cwd) ...@@ -77,12 +73,8 @@ getwd(char *cwd)
return NULL; return NULL;
} }
dirid= pb.d.ioDrParID; dirid= pb.d.ioDrParID;
#if TARGET_API_MAC_CARBON
p2cstrcpy(ebuf, (StringPtr)ebuf); p2cstrcpy(ebuf, (StringPtr)ebuf);
ebuf += strlen(ebuf); ebuf += strlen(ebuf);
#else
ebuf += strlen((const char *)p2cstr((unsigned char *)ebuf));
#endif
/* Should check for buf overflow */ /* Should check for buf overflow */
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment