github/amiga-smbfs
1
0
Fork 0
mirror of https://github.com/obarthel/amiga-smbfs.git synced 2025-12-08 14:58:35 +00:00
Code Releases Activity

Updated to version 2.13

Browse Source 
The ACTION_CREATE_DIR, ACTION_DELETE_OBJECT, ACTION_FINDOUTPUT, ACTION_RENAME_OBJECT, ACTION_SET_DATE, ACTION_SET_FILE_SIZE, ACTION_SET_PROTECT and ACTION_WRITE operations now set use more appropriate error codes instead of always translating an unspecific "access denied" error into "ERROR_READ_PROTECTED". For example, for ACTION_DELETE_OBJECT the new translation of "access denied" will be "ERROR_DELETE_PROTECTED".

Added the ErrorOutput option, which can be either "stderr" (default) or "stdout". Its purpose is to allow error messages written by smbfs to be redirected to a file, which will not work for AmigaDOS shell versions 36-40 if smbfs uses "stderr". Use ErrorOutput=stdout to be able to redirect all smbfs output, including any error messages, to a file.

Updated the copyright text.

Output to console or log files is now line-buffered.
This commit is contained in:
obarthel
2019-02-09 11:58:20 +01:00
parent 401f1291e3
commit d058085b8a
25 changed files with 190 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source_code/main.c
+115 -27
View File
@@ -3,7 +3,7 @@
*
* SMB file system wrapper for AmigaOS, using the AmiTCP V3 API
*
* Copyright (C) 2000-2018 by Olaf `Olsen' Barthel <obarthel -at- gmx -dot- net>
* Copyright (C) 2000-2019 by Olaf `Olsen' Barthel <obarthel -at- gmx -dot- net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -325,6 +325,8 @@ static struct MsgPort * FileSystemPort;
static smba_server_t * ServerData;
static const TEXT * ErrorOutput;
static BOOL Quit;
static BOOL Quiet;
static BOOL CaseSensitive;
@@ -779,6 +781,7 @@ main(void)
NUMBER Timeout;
NUMBER TimeZoneOffset;
NUMBER DSTOffset;
KEY ErrorOutput;
KEY Protocol;
SWITCH NetBIOSTransport;
SWITCH WriteBehind;
@@ -826,6 +829,7 @@ main(void)
"TIMEOUT/N/K,"
"TZ=TIMEZONEOFFSET/N/K,"
"DST=DSTOFFSET/N/K,"
"ERROROUTPUT/K,"
"PROTOCOL/K,"
"NETBIOS/S,"
"WRITEBEHIND/S,"
@@ -880,8 +884,8 @@ main(void)
memset(&args,0,sizeof(args));
/* If this program was launched from Workbench, the
* command parameters will have to be from the icon
* tool types.
* command parameters will have to be read from the
* icon tool types.
*/
if(WBStartup != NULL)
{
@@ -978,6 +982,8 @@ main(void)
{
D_S(struct FileInfoBlock, fib);
SetVBuf(debug_file, NULL, BUF_LINE, 512);
Seek(debug_file,0,OFFSET_END);
close_debug_file = TRUE;
@@ -1224,6 +1230,8 @@ main(void)
{
D_S(struct FileInfoBlock, fib);
SetVBuf(debug_file, NULL, BUF_LINE, 512);
Seek(debug_file,0,OFFSET_END);
close_debug_file = TRUE;
@@ -1370,6 +1378,23 @@ main(void)
if(args.VolumeName != NULL)
args.AddVolume = "yes";
/* Where do we send error messages to if started from shell? */
if(WBStartup == NULL)
{
if(args.Protocol != NULL && Stricmp(args.Protocol,"stderr") == SAME)
args.Protocol = NULL;
if(args.Protocol != NULL && Stricmp(args.Protocol,"stdout") != SAME)
{
report_error("'ERROROUTPUT' parameter must be either 'STDERR' or 'STDOUT'.");
goto out;
}
D(("using 'erroroutput=%s'.", (args.ErrorOutput != NULL) ? "stderr" : "stdout"));
ErrorOutput = args.ErrorOutput;
}
/* Restrict the command set which smbfs uses? */
if(args.Protocol == NULL)
{
@@ -2098,39 +2123,68 @@ report_error(const TEXT * fmt,...)
GetProgramName(program_name,sizeof(program_name));
if(this_process->pr_CES != ZERO)
/* Print the error message on the standard error output
* stream?
*/
if(ErrorOutput == NULL)
{
output = this_process->pr_CES;
/* Do we have a valid error output stream? This
* likely won't work with the V36-V40 shell, but
* we check this anyway.
*/
if(this_process->pr_CES != ZERO)
{
output = this_process->pr_CES;
}
/* So we need to try to write straight to the
* output window.
*/
else
{
/* Can we write straight to the output window? */
output = Open("CONSOLE:", MODE_NEWFILE);
if(output != ZERO)
{
SetVBuf(output, NULL, BUF_LINE, 512);
close_output = TRUE;
}
/* Fall back to using the standard output stream. */
else
{
output = Output();
}
}
}
/* No, we use the standard output stream. */
else
{
output = Open("CONSOLE:", MODE_NEWFILE);
if(output != ZERO)
close_output = TRUE;
else
output = Output();
output = Output();
}
LocalFPrintf(output, "%s: ",FilePart(program_name));
#if defined(__amigaos4__)
if(output != ZERO)
{
va_startlinear(args,fmt);
VFPrintf(output, fmt, va_getlinearva(args,APTR));
va_end(args);
}
#else
{
va_start(args,fmt);
VFPrintf(output,fmt,args);
va_end(args);
}
#endif /* __amigaos4__ */
LocalFPrintf(output, "%s: ",FilePart(program_name));
LocalFPrintf(output, "\n");
#if defined(__amigaos4__)
{
va_startlinear(args,fmt);
VFPrintf(output, fmt, va_getlinearva(args,APTR));
va_end(args);
}
#else
{
va_start(args,fmt);
VFPrintf(output,fmt,args);
va_end(args);
}
#endif /* __amigaos4__ */
if(close_output)
Close(output);
LocalFPrintf(output, "\n");
if(close_output)
Close(output);
}
}
}
}
@@ -5953,6 +6007,10 @@ Action_DeleteObject(
free_memory(full_name);
free_memory(full_parent_name);
/* This can never be a read protection error (EACCES). */
if(error == ERROR_READ_PROTECTED)
error = ERROR_DELETE_PROTECTED;
(*error_ptr) = error;
RETURN(result);
@@ -6088,6 +6146,10 @@ Action_CreateDir(
free_memory(full_name);
free_memory(ln);
/* This can never be a read protection error (EACCES). */
if(error == ERROR_READ_PROTECTED)
error = ERROR_WRITE_PROTECTED;
(*error_ptr) = error;
RETURN(result);
@@ -6634,6 +6696,10 @@ Action_SetProtect(
free_memory(full_name);
/* This can never be a read protection error (EACCES). */
if(error == ERROR_READ_PROTECTED)
error = ERROR_WRITE_PROTECTED;
(*error_ptr) = error;
RETURN(result);
@@ -6798,6 +6864,10 @@ Action_RenameObject(
free_memory(parent_source_name);
free_memory(parent_destination_name);
/* This can never be a read protection error (EACCES). */
if(error == ERROR_READ_PROTECTED)
error = ERROR_WRITE_PROTECTED;
(*error_ptr) = error;
RETURN(result);
@@ -8439,6 +8509,12 @@ Action_Find(
free_memory(fn);
free_memory(parent_path);
/* This can never be a read protection error (EACCES) for
* ACTION_FINDOUTPUT.
*/
if(error == ERROR_READ_PROTECTED && action == ACTION_FINDOUTPUT)
error = ERROR_WRITE_PROTECTED;
(*error_ptr) = error;
RETURN(result);
@@ -8547,6 +8623,10 @@ Action_Write(
out:
/* This can never be a read protection error (EACCES). */
if(error == ERROR_READ_PROTECTED)
error = ERROR_WRITE_PROTECTED;
(*error_ptr) = error;
RETURN(result);
@@ -8903,6 +8983,10 @@ Action_SetFileSize(
out:
/* This can never be a read protection error (EACCES). */
if(error == ERROR_READ_PROTECTED)
error = ERROR_WRITE_PROTECTED;
(*error_ptr) = error;
RETURN(result);
@@ -9054,6 +9138,10 @@ Action_SetDate(
free_memory(full_name);
/* This can never be a read protection error (EACCES). */
if(error == ERROR_READ_PROTECTED)
error = ERROR_WRITE_PROTECTED;
(*error_ptr) = error;
RETURN(result);