Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main
Synchronet
Commits
c84808d0
Commit
c84808d0
authored
2 years ago
by
Rob Swindell
Browse files
Options
Downloads
Patches
Plain Diff
Send error output to stderr, non-error output to stdout
Fixes issue
#390
parent
82b3374f
No related branches found
No related tags found
1 merge request
!463
MRC mods by Codefenix (2024-10-20)
Pipeline
#2974
passed
2 years ago
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/sbbs3/qwknodes.c
+13
-15
13 additions, 15 deletions
src/sbbs3/qwknodes.c
with
13 additions
and
15 deletions
src/sbbs3/qwknodes.c
+
13
−
15
View file @
c84808d0
...
...
@@ -60,7 +60,7 @@ int lputs(char* str)
else
tmp
[
k
++
]
=
str
[
i
];
tmp
[
k
]
=
0
;
return
(
fputs
(
tmp
,
std
err
));
return
(
fputs
(
tmp
,
std
out
));
}
/****************************************************************************/
/* Performs printf() through local assembly routines */
...
...
@@ -162,11 +162,9 @@ int main(int argc, char **argv)
FILE
*
route
,
*
users
,
*
nodes
;
time_t
now
;
smbmsg_t
msg
;
char
revision
[
16
]
;
const
char
*
revision
=
"1.26"
;
sscanf
(
"$Revision: 1.25 $"
,
"%*s %s"
,
revision
);
fprintf
(
stderr
,
"
\n
Synchronet QWKnet Node/Route/User List Generator v%s-%s
\n
"
fprintf
(
stdout
,
"
\n
Synchronet QWKnet Node/Route/User List Generator v%s-%s
\n
"
,
revision
,
PLATFORM_DESC
);
for
(
i
=
1
;
i
<
argc
;
i
++
)
...
...
@@ -251,26 +249,26 @@ int main(int argc, char **argv)
now
=
time
(
NULL
);
smm
=
crc16
(
"smm"
,
0
);
sbl
=
crc16
(
"sbl"
,
0
);
fprintf
(
std
err
,
"
\n\n
"
);
fprintf
(
std
out
,
"
\n\n
"
);
for
(
i
=
0
;
i
<
cfg
.
total_subs
;
i
++
)
{
if
(
!
(
cfg
.
sub
[
i
]
->
misc
&
SUB_QNET
))
continue
;
fprintf
(
std
err
,
"%-*s %s
\n
"
fprintf
(
std
out
,
"%-*s %s
\n
"
,
LEN_GSNAME
,
cfg
.
grp
[
cfg
.
sub
[
i
]
->
grp
]
->
sname
,
cfg
.
sub
[
i
]
->
lname
);
sprintf
(
smb
.
file
,
"%s%s"
,
cfg
.
sub
[
i
]
->
data_dir
,
cfg
.
sub
[
i
]
->
code
);
smb
.
retry_time
=
30
;
smb
.
subnum
=
i
;
if
((
j
=
smb_open
(
&
smb
))
!=
0
)
{
printf
(
"smb_open returned %d
\n
"
,
j
);
f
printf
(
stderr
,
"smb_open returned %d
\n
"
,
j
);
continue
;
}
if
((
j
=
smb_locksmbhdr
(
&
smb
))
!=
0
)
{
printf
(
"smb_locksmbhdr returned %d
\n
"
,
j
);
f
printf
(
stderr
,
"smb_locksmbhdr returned %d
\n
"
,
j
);
smb_close
(
&
smb
);
continue
;
}
if
((
j
=
smb_getstatus
(
&
smb
))
!=
0
)
{
printf
(
"smb_getstatus returned %d
\n
"
,
j
);
f
printf
(
stderr
,
"smb_getstatus returned %d
\n
"
,
j
);
smb_close
(
&
smb
);
continue
;
}
...
...
@@ -286,17 +284,17 @@ int main(int argc, char **argv)
fseek
(
smb
.
sid_fp
,
msg
.
idx_offset
*
sizeof
(
idxrec_t
),
SEEK_SET
);
if
(
!
fread
(
&
msg
.
idx
,
1
,
sizeof
(
idxrec_t
),
smb
.
sid_fp
))
break
;
fprintf
(
std
err
,
"%-5u
\r
"
,
msg
.
idx_offset
+
1
);
fprintf
(
std
out
,
"%-5u
\r
"
,
msg
.
idx_offset
+
1
);
if
(
msg
.
idx
.
to
==
smm
||
msg
.
idx
.
to
==
sbl
)
continue
;
if
(
max_age
&&
now
-
msg
.
idx
.
time
>
((
time_t
)
max_age
*
24UL
*
60UL
*
60UL
))
continue
;
if
((
j
=
smb_lockmsghdr
(
&
smb
,
&
msg
))
!=
0
)
{
printf
(
"smb_lockmsghdr returned %d
\n
"
,
j
);
f
printf
(
stderr
,
"smb_lockmsghdr returned %d
\n
"
,
j
);
break
;
}
if
((
j
=
smb_getmsghdr
(
&
smb
,
&
msg
))
!=
0
)
{
printf
(
"smb_getmsghdr returned %d
\n
"
,
j
);
f
printf
(
stderr
,
"smb_getmsghdr returned %d
\n
"
,
j
);
break
;
}
smb_unlockmsghdr
(
&
smb
,
&
msg
);
...
...
@@ -400,11 +398,11 @@ int main(int argc, char **argv)
smb_close
(
&
smb
);
if
(
kbhit
())
{
getch
();
fprintf
(
std
err
,
"Key pressed.
\n
"
);
fprintf
(
std
out
,
"Key pressed.
\n
"
);
break
;
}
}
fprintf
(
std
err
,
"Done.
\n
"
);
fprintf
(
std
out
,
"Done.
\n
"
);
return
(
0
);
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment