1
0
mirror of https://github.com/rcornwell/sims.git synced 2026-01-13 15:27:04 +00:00

SCP: Updated to current.

This commit is contained in:
Richard Cornwell 2023-11-30 20:56:36 -05:00
parent b646a69375
commit 4fb17c84b4
5 changed files with 16 additions and 11 deletions

6
scp.c
View File

@ -249,6 +249,10 @@
#include <editline/readline.h>
#endif
#if defined(SIM_NEED_GIT_COMMIT_ID)
#include ".git-commit-id.h"
#endif
#ifndef MAX
#define MAX(a,b) (((a) >= (b)) ? (a) : (b))
#endif
@ -2932,6 +2936,8 @@ if (docmdp) {
snprintf(nbuf, sizeof (nbuf), "\"%s%s%ssimh.ini\"", cptr2 ? cptr2 : "", cptr, strchr (cptr, '/') ? "/" : "\\");
stat = docmdp->action (-1, nbuf); /* simh.ini proc cmd file */
}
else
stat = SCPE_OPENERR;
if (SCPE_BARE_STATUS(stat) == SCPE_OPENERR)
stat = docmdp->action (-1, "simh.ini"); /* simh.ini proc cmd file */
if (*cbuf) /* cmd file arg? */

View File

@ -121,6 +121,7 @@
#define SIM_DEFS_H_ 0
#include "sim_rev.h"
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>

View File

@ -2439,6 +2439,8 @@ time_t now = time (NULL);
t_offset total_sectors;
t_offset highwater;
return SCPE_OK;
if ((dptr = find_dev_from_unit (uptr)) == NULL)
return SCPE_NOATT;
if (uptr->flags & UNIT_RO)
@ -2502,6 +2504,8 @@ t_offset total_sectors;
t_offset highwater;
t_offset footer_highwater;
return SCPE_OK;
if ((dptr = find_dev_from_unit (uptr)) == NULL)
return SCPE_NOATT;
if (uptr->flags & UNIT_RO)

View File

@ -44,17 +44,11 @@
#define SIM_VERSION_MODE "Current"
#endif
#if defined(SIM_NEED_GIT_COMMIT_ID)
#include ".git-commit-id.h"
#endif
/*
Simh's git commit id would be undefined when working with an
extracted archive (zip file or tar ball). To address this
problem and record the commit id that the archive was created
from, the archive creation process populates the below
information as a consequence of the "sim_rev.h export-subst"
line in the .gitattributes file.
SIM__GIT_COMMMIT_ID is undefined when working with an
archive (zip file or tar ball). Use Git keyword subsitution
to record the archive's commit id via the .gitattributes
"export-subst".
*/
#define SIM_ARCHIVE_GIT_COMMIT_ID $Format:%H$
#define SIM_ARCHIVE_GIT_COMMIT_TIME $Format:%aI$

View File

@ -1088,7 +1088,7 @@ if (!(opt_flags & SIM_SOCK_OPT_BLOCKING)) {
if (sta == SOCKET_ERROR) /* fcntl error? */
return sim_err_sock (newsock, "setnonblock");
}
sta = listen (newsock, 1); /* listen on socket */
sta = listen (newsock, 64); /* listen on socket */
if (sta == SOCKET_ERROR) /* listen error? */
return sim_err_sock (newsock, "listen");
return newsock; /* got it! */