PATCH: IBM AIX patches
- From: Christian Schaller <Uraeus linuxrising org>
- To: mc-devel gnome org
- Subject: PATCH: IBM AIX patches
- Date: 20 Aug 2001 17:57:28 +0200
Hi,
Here is the patch for MC from the official IBM package.
(From http://www-1.ibm.com/servers/aix/products/aixos/linux/index.html)
Since I believe that these patches haven't been submitted before I am
sending them to the respective lists.
Christian
Index: gnome1.2/mc-4.5.49/gnome/Makefile.in
diff -c gnome1.2/mc-4.5.49/gnome/Makefile.in:1.1 gnome1.2/mc-4.5.49/gnome/Makefile.in:1.2
*** gnome1.2/mc-4.5.49/gnome/Makefile.in:1.1 Mon Jun 12 16:57:39 2000
--- gnome1.2/mc-4.5.49/gnome/Makefile.in Tue Sep 5 12:05:54 2000
***************
*** 268,274 ****
$(CC) -o corba-gmc $(CORBAOBJS) $(OBJS) $(EXTRALIBS) $(CORBA_LDFLAGS) $(LIBS)
gmc-client: $(CLIENTOBJS)
! $(CC) -o gmc-client $(CLIENTOBJS) $(CORBA_LDFLAGS) $(LIBS)
mc.keys: mc.keys.in Makefile
sed -e 's^\ icondir\@^$(icondir)^g' \
--- 268,274 ----
$(CC) -o corba-gmc $(CORBAOBJS) $(OBJS) $(EXTRALIBS) $(CORBA_LDFLAGS) $(LIBS)
gmc-client: $(CLIENTOBJS)
! $(CC) -o gmc-client $(CLIENTOBJS) $(EXTRALIBS) $(CORBA_LDFLAGS) $(LIBS)
mc.keys: mc.keys.in Makefile
sed -e 's^\ icondir\@^$(icondir)^g' \
Index: gnome1.2/mc-4.5.49/gnome/gcmd.c
diff -c gnome1.2/mc-4.5.49/gnome/gcmd.c:1.1 gnome1.2/mc-4.5.49/gnome/gcmd.c:1.2
*** gnome1.2/mc-4.5.49/gnome/gcmd.c:1.1 Mon Jun 12 16:57:40 2000
--- gnome1.2/mc-4.5.49/gnome/gcmd.c Tue Sep 5 11:57:45 2000
***************
*** 415,420 ****
--- 415,421 ----
break;
case 1:
default:
+ ;
}
if (destroy)
gtk_widget_destroy (dlg);
***************
*** 614,619 ****
--- 615,621 ----
destroy = FALSE;
break;
default:
+ ;
}
for (i = 0; i < GTK_CLIST (data->clist)->rows; i++) {
row_data = gtk_clist_get_row_data (GTK_CLIST (data->clist), i);
Index: gnome1.2/mc-4.5.49/gnome/gdialogs.c
diff -c gnome1.2/mc-4.5.49/gnome/gdialogs.c:1.1 gnome1.2/mc-4.5.49/gnome/gdialogs.c:1.2
*** gnome1.2/mc-4.5.49/gnome/gdialogs.c:1.1 Mon Jun 12 16:57:40 2000
--- gnome1.2/mc-4.5.49/gnome/gdialogs.c Tue Sep 5 11:55:17 2000
***************
*** 814,819 ****
--- 814,820 ----
ctx->recursive_result = RECURSIVE_ABORT;
break;
default:
+ ;
}
if (ctx->recursive_result != RECURSIVE_ABORT)
Index: gnome1.2/mc-4.5.49/gnome/gtkdtree.c
diff -c gnome1.2/mc-4.5.49/gnome/gtkdtree.c:1.1 gnome1.2/mc-4.5.49/gnome/gtkdtree.c:1.3
*** gnome1.2/mc-4.5.49/gnome/gtkdtree.c:1.1 Mon Jun 12 16:57:40 2000
--- gnome1.2/mc-4.5.49/gnome/gtkdtree.c Tue Sep 5 12:02:10 2000
***************
*** 20,25 ****
--- 20,29 ----
#include "gtkdtree.h"
#include "../vfs/vfs.h"
+ #ifdef HAVE_ALLOCA_H
+ #include <alloca.h>
+ #endif
+
#define FREEZE
#ifdef HACK
***************
*** 313,319 ****
if (dtree->current_path && (strcmp (path, dtree->current_path) == 0))
return TRUE;
! s = alloca (strlen (path) + 1);
strcpy (s, path);
current_node = dtree->root_node;
--- 317,323 ----
if (dtree->current_path && (strcmp (path, dtree->current_path) == 0))
return TRUE;
! s = (char *)alloca (strlen (path) + 1);
strcpy (s, path);
current_node = dtree->root_node;
Index: gnome1.2/mc-4.5.49/vfs/cpio.c
diff -c gnome1.2/mc-4.5.49/vfs/cpio.c:1.1 gnome1.2/mc-4.5.49/vfs/cpio.c:1.2
*** gnome1.2/mc-4.5.49/vfs/cpio.c:1.1 Mon Jun 12 16:57:30 2000
--- gnome1.2/mc-4.5.49/vfs/cpio.c Tue Sep 5 11:50:06 2000
***************
*** 101,107 ****
static int cpio_read(void *fh, char *buffer, int count);
#define CPIO_POS(super) cpio_position
! //#define CPIO_POS(super) (super)->u.cpio.fd /* If some time reentrancy should be needed */
#define CPIO_SEEK_SET(super, where) mc_lseek((super)->u.cpio.fd, CPIO_POS(super) = (where), SEEK_SET)
#define CPIO_SEEK_CUR(super, where) mc_lseek((super)->u.cpio.fd, CPIO_POS(super) += (where), SEEK_SET)
--- 101,107 ----
static int cpio_read(void *fh, char *buffer, int count);
#define CPIO_POS(super) cpio_position
! /* //#define CPIO_POS(super) (super)->u.cpio.fd */ /* If some time reentrancy should be needed */
#define CPIO_SEEK_SET(super, where) mc_lseek((super)->u.cpio.fd, CPIO_POS(super) = (where), SEEK_SET)
#define CPIO_SEEK_CUR(super, where) mc_lseek((super)->u.cpio.fd, CPIO_POS(super) += (where), SEEK_SET)
Index: gnome1.2/mc-4.5.49/vfs/fish.c
diff -c gnome1.2/mc-4.5.49/vfs/fish.c:1.1 gnome1.2/mc-4.5.49/vfs/fish.c:1.2
*** gnome1.2/mc-4.5.49/vfs/fish.c:1.1 Mon Jun 12 16:57:30 2000
--- gnome1.2/mc-4.5.49/vfs/fish.c Tue Sep 5 11:51:56 2000
***************
*** 702,708 ****
"echo '### 000'\n",
sgroup, rpath,
sgroup, rpath);
! //send_fish_command(me, super, buf, OPT_FLUSH);
POSTFIX(OPT_FLUSH)
}
--- 702,708 ----
"echo '### 000'\n",
sgroup, rpath,
sgroup, rpath);
! /* //send_fish_command(me, super, buf, OPT_FLUSH); */
POSTFIX(OPT_FLUSH)
}
Index: gnome1.2/mc-4.5.49/vfs/tar.c
diff -c gnome1.2/mc-4.5.49/vfs/tar.c:1.1 gnome1.2/mc-4.5.49/vfs/tar.c:1.2
*** gnome1.2/mc-4.5.49/vfs/tar.c:1.1 Mon Jun 12 16:57:30 2000
--- gnome1.2/mc-4.5.49/vfs/tar.c Tue Sep 5 11:51:03 2000
***************
*** 192,198 ****
STATUS_BADCHECKSUM,
STATUS_SUCCESS,
STATUS_EOFMARK,
! STATUS_EOF,
} ReadStatus;
/*
* Return 1 for success, 0 if the checksum is bad, EOF on eof,
--- 192,198 ----
STATUS_BADCHECKSUM,
STATUS_SUCCESS,
STATUS_EOFMARK,
! STATUS_EOF
} ReadStatus;
/*
* Return 1 for success, 0 if the checksum is bad, EOF on eof,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]