svn commit: r384200 - head/emulators/doscmd/files

[Dmitry Marakasov]

Author: amdmi3
Date: Sat Apr 18 01:52:35 2015
New Revision: 384200
URL: https://svnweb.freebsd.org/changeset/ports/384200

Log:
  - Actually add patches

Added:
  head/emulators/doscmd/files/
  head/emulators/doscmd/files/extra-patch-cwd.c   (contents, props changed)
  head/emulators/doscmd/files/patch-config.c   (contents, props changed)
  head/emulators/doscmd/files/patch-int13.c   (contents, props changed)
  head/emulators/doscmd/files/patch-trap.c   (contents, props changed)

Added: head/emulators/doscmd/files/extra-patch-cwd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/doscmd/files/extra-patch-cwd.c	Sat Apr 18 01:52:35 2015	(r384200)
@@ -0,0 +1,16 @@
+This call changes internal descriptor in DIR structure so it's
+located at the top of file descriptor table. I guess it is needed
+to not interfere with other file descriptor order or to keep their
+values small. doscmd may work fine without it, but it should be
+tested.
+--- cwd.c.orig	2011-08-26 16:48:21 UTC
++++ cwd.c
+@@ -889,7 +889,7 @@ find_first(u_char *path, int attr, dosdi
+ 	++search->searchend;
+     *search->searchend++ = '/';
+ 
+-    search->dp->dd_fd = squirrel_fd(search->dp->dd_fd);
++    //search->dp->dd_fd = squirrel_fd(search->dp->dd_fd);
+ 
+     dta->drive = drive | 0x80;
+     to_dos_fcb(dta->pattern, slash);

Added: head/emulators/doscmd/files/patch-config.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/doscmd/files/patch-config.c	Sat Apr 18 01:52:35 2015	(r384200)
@@ -0,0 +1,19 @@
+--- config.c.orig	2011-08-26 16:48:21 UTC
++++ config.c
+@@ -213,14 +213,14 @@ init_hard:
+                     quit(1);
+                 }
+                 errno = 0;
+-                addr = (int)strtol(av[3], '\0', 0);
++                addr = (int)strtol(av[3], NULL, 0);
+                 /* XXX DEBUG ISA-specific */
+                 if ((errno != 0) || (addr > MAXPORT)) {
+                     fprintf(stderr, "usage: assign com[1-4] path addr irq\n");
+                     quit(1);
+                 }
+                 errno = 0;
+-                irq = (unsigned char)strtol(av[4], '\0', 0);
++                irq = (unsigned char)strtol(av[4], NULL, 0);
+                 /* XXX DEBUG ISA-specific */
+                 if ((errno != 0) || (irq < 2) || (irq > 7)) {
+                     fprintf(stderr, "usage: assign com[1-4] path addr irq[2-7]\n");

Added: head/emulators/doscmd/files/patch-int13.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/doscmd/files/patch-int13.c	Sat Apr 18 01:52:35 2015	(r384200)
@@ -0,0 +1,20 @@
+--- int13.c.orig	2011-08-26 16:48:21 UTC
++++ int13.c
+@@ -487,7 +487,7 @@ diread(struct diskinfo *di, regcontext_t
+     off_t res;
+ 
+     int drive = di - diskinfo;
+-    di->multi = -1;
++    di->multi = 3;
+ 
+     if (drive > 1) {
+ 	drive -= 2;
+@@ -536,7 +536,7 @@ diwrite(struct diskinfo *di, regcontext_
+ {
+     off_t res;
+     int drive = di - diskinfo;
+-    di->multi = -1;
++    di->multi = 3;
+ 
+     if (drive > 1) {
+ 	drive -= 2;

Added: head/emulators/doscmd/files/patch-trap.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/doscmd/files/patch-trap.c	Sat Apr 18 01:52:35 2015	(r384200)
@@ -0,0 +1,11 @@
+--- trap.c.orig	2011-08-26 16:48:21 UTC
++++ trap.c
+@@ -295,7 +295,7 @@ sigbus(struct sigframe *sf)
+     callback_t		func;
+     regcontext_t	*REGS = (regcontext_t *)(&sf->sf_uc.uc_mcontext);
+ 
+-    if (!(R_EFLAGS && PSL_VM))
++    if (!(R_EFLAGS & PSL_VM))
+ 	fatal("SIGBUS in the emulator\n");
+ 
+     if ((int)sf->sf_siginfo != 0) {