58 lines
2.8 KiB
Diff
58 lines
2.8 KiB
Diff
Fix compilation with glibc-2.32.
|
|
|
|
--- me091011-orig/src/file.c
|
|
+++ me091011/src/file.c
|
|
@@ -1325,7 +1325,7 @@
|
|
)
|
|
{
|
|
/* READ ONLY DIR */
|
|
- mlwrite(MWPAUSE,(meUByte *)"%s: %s", dirbuf, sys_errlist[errno]);
|
|
+ mlwrite(MWPAUSE,(meUByte *)"%s: %s", dirbuf, strerror(errno));
|
|
/* Zap the filename - it is invalid.
|
|
We only want a buffer */
|
|
mlwrite (0,(meUByte *)"[New buffer %s]", getFileBaseName(fname));
|
|
@@ -1355,7 +1355,7 @@
|
|
{
|
|
/* We are not allowed to read the file */
|
|
#if ((defined _UNIX) || (defined _DOS))
|
|
- mlwrite(MWABORT,(meUByte *)"[%s: %s]", fn, sys_errlist[errno]) ;
|
|
+ mlwrite(MWABORT,(meUByte *)"[%s: %s]", fn, strerror(errno)) ;
|
|
#else
|
|
mlwrite(MWABORT,"[cannot read: %s]", fn) ;
|
|
#endif
|
|
--- me091011-orig/src/fileio.c
|
|
+++ me091011/src/fileio.c
|
|
@@ -2331,7 +2331,7 @@
|
|
if(meRename(filename,filename2) && (ffFileOp(filename,filename2,meRWFLAG_DELETE,-1) <= 0))
|
|
{
|
|
mlwrite(MWABORT|MWPAUSE,(meUByte *)"[Unable to backup file to %s (%d - %s)]",
|
|
- filename2,errno,sys_errlist[errno]) ;
|
|
+ filename2,errno,strerror(errno)) ;
|
|
if(meUnlink(filename))
|
|
{
|
|
mlwrite(MWABORT|MWPAUSE,(meUByte *)"[Unable to remove backup file %s]", filename) ;
|
|
@@ -2346,7 +2346,7 @@
|
|
mlwrite(MWABORT|MWPAUSE,(meUByte *)"[Unable to remove backup file %s]", filename) ;
|
|
else if(meRename(filenameOld,filename) && (ffFileOp(filenameOld,filename,meRWFLAG_DELETE,-1) <= 0))
|
|
mlwrite(MWABORT|MWPAUSE,(meUByte *)"[Unable to backup file to %s (%d - %s)]",
|
|
- filename,errno,sys_errlist[errno]) ;
|
|
+ filename,errno,strerror(errno)) ;
|
|
else if(bp != NULL)
|
|
{
|
|
meUShort ss;
|
|
--- me091011-orig/src/spawn.c
|
|
+++ me091011/src/spawn.c
|
|
@@ -219,10 +219,10 @@
|
|
case 0:
|
|
/* we want the children to die on interrupt */
|
|
execlp("xterm", "xterm", "-sl", "200", "-sb", NULL);
|
|
- mlwrite(MWABORT,(meUByte *)"exec failed, %s", sys_errlist[errno]);
|
|
+ mlwrite(MWABORT,(meUByte *)"exec failed, %s", strerror(errno));
|
|
meExit(127);
|
|
case -1:
|
|
- ss = mlwrite(MWABORT,(meUByte *)"exec failed, %s", sys_errlist[errno]);
|
|
+ ss = mlwrite(MWABORT,(meUByte *)"exec failed, %s", strerror(errno));
|
|
default:
|
|
ss = meTRUE ;
|
|
}
|