-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Currently, we use the non-ANSI rindex() and index() in a few places. The
attached patch replaces them with strrchr() and strchr(). Both of these
functions are also in BSD 4.3, which specifies (r)index(), so we shouldn't
have any problems.
sam th
[EMAIL PROTECTED]
http://bur-jud-118-039.rh.uchicago.edu
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.1 (GNU/Linux)
Comment: For info see http://www.gnupg.org
iD8DBQE49mlVt+kM0Mq9M/wRAlI2AKCsJVLVfD/5tzygjzATKuYTZzg9jgCggCwQ
6zydCnwWIZFKFvjVU4d/NDg=
=nYhi
-----END PGP SIGNATURE-----
Index: src/af/xap/qnx/xap_QNXDlg_FileOpenSaveAs.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/xap/qnx/xap_QNXDlg_FileOpenSaveAs.cpp,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 xap_QNXDlg_FileOpenSaveAs.cpp
--- src/af/xap/qnx/xap_QNXDlg_FileOpenSaveAs.cpp 2000/01/11 12:10:32
1.1.1.1
+++ src/af/xap/qnx/xap_QNXDlg_FileOpenSaveAs.cpp 2000/04/14 00:37:02
@@ -256,7 +256,7 @@
// for a matching directory. We can then proceed with the file
// if another stat of that dir passes.
- pLastSlash = rindex(szFinalPathnameCopy,'/');
+ pLastSlash = strrchr(szFinalPathnameCopy,'/');
if (!pLastSlash)
{
_notifyError_OKOnly(pFrame,XAP_STRING_ID_DLG_InvalidPathname);
@@ -793,7 +793,7 @@
// for a matching directory. We can then proceed with the file
// if another stat of that dir passes.
- pLastSlash = rindex(szFinalPathnameCopy,'/');
+ pLastSlash = strrchr(szFinalPathnameCopy,'/');
if (!pLastSlash)
{
_notifyError_OKOnly(pFrame,XAP_STRING_ID_DLG_InvalidPathname);
Index: src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp,v
retrieving revision 1.34
diff -u -r1.34 xap_UnixDlg_FileOpenSaveAs.cpp
--- src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2000/01/29 01:07:13 1.34
+++ src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2000/04/14 00:37:02
@@ -277,7 +277,7 @@
// for a matching directory. We can then proceed with the file
// if another stat of that dir passes.
- pLastSlash = rindex(szFinalPathnameCopy,'/');
+ pLastSlash = strrchr(szFinalPathnameCopy,'/');
if (!pLastSlash)
{
_notifyError_OKOnly(pFrame,XAP_STRING_ID_DLG_InvalidPathname);
@@ -580,7 +580,7 @@
// the dialog there (but without a filename).
UT_cloneString(szPersistDirectory,m_szPersistPathname);
- char * pLastSlash = rindex(szPersistDirectory, '/');
+ char * pLastSlash = strrchr(szPersistDirectory, '/');
if (pLastSlash)
pLastSlash[1] = 0;
gtk_file_selection_set_filename(pFS,szPersistDirectory);
@@ -611,7 +611,7 @@
// use directory(m_szInitialPathname)
UT_cloneString(szPersistDirectory,m_szInitialPathname);
- char * pLastSlash = rindex(szPersistDirectory, '/');
+ char * pLastSlash = strrchr(szPersistDirectory, '/');
if (pLastSlash)
pLastSlash[1] = 0;
gtk_file_selection_set_filename(pFS,szPersistDirectory);
Index: src/af/xap/unix/xap_UnixFontManager.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/xap/unix/xap_UnixFontManager.cpp,v
retrieving revision 1.30
diff -u -r1.30 xap_UnixFontManager.cpp
--- src/af/xap/unix/xap_UnixFontManager.cpp 2000/02/08 01:35:16 1.30
+++ src/af/xap/unix/xap_UnixFontManager.cpp 2000/04/14 00:37:02
@@ -301,8 +301,8 @@
char * linedup = UT_strdup(line);
// Look for either first space or first tab
- char * firstspace = index(linedup, ' ');
- char * firsttab = index(linedup, '\t');
+ char * firstspace = strchr(linedup, ' ');
+ char * firsttab = strchr(linedup, '\t');
UT_uint32 whitespace;
