Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
babeld
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
babeld
Commits
b98fb201
Commit
b98fb201
authored
Sep 26, 2018
by
Juliusz Chroboczek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix incorrect handling of multiple local commands in a single read.
parent
53518417
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
41 additions
and
38 deletions
+41
-38
local.c
local.c
+41
-38
No files found.
local.c
View file @
b98fb201
...
...
@@ -316,7 +316,7 @@ local_notify_all_1(struct local_socket *s)
int
local_read
(
struct
local_socket
*
s
)
{
int
rc
;
int
rc
,
n
;
char
*
eol
;
char
reply
[
100
]
=
"ok
\n
"
;
const
char
*
message
=
NULL
;
...
...
@@ -336,11 +336,13 @@ local_read(struct local_socket *s)
return
rc
;
s
->
n
+=
rc
;
while
(
s
->
n
>
0
)
{
eol
=
memchr
(
s
->
buf
,
'\n'
,
s
->
n
);
if
(
eol
==
NULL
)
return
1
;
break
;
n
=
eol
+
1
-
s
->
buf
;
rc
=
parse_config_from_string
(
s
->
buf
,
eol
+
1
-
s
->
buf
,
&
message
);
rc
=
parse_config_from_string
(
s
->
buf
,
n
,
&
message
);
switch
(
rc
)
{
case
CONFIG_ACTION_DONE
:
break
;
...
...
@@ -368,15 +370,16 @@ local_read(struct local_socket *s)
if
(
reply
[
0
]
!=
'\0'
)
{
rc
=
write_timeout
(
s
->
fd
,
reply
,
strlen
(
reply
));
if
(
rc
<
0
)
if
(
rc
<
0
)
{
goto
fail
;
}
}
if
(
s
->
n
>
n
)
memmove
(
s
->
buf
,
s
->
buf
+
n
,
s
->
n
-
n
);
s
->
n
-=
n
;
}
if
(
s
->
n
>
eol
+
1
-
s
->
buf
)
{
memmove
(
s
->
buf
,
eol
+
1
,
s
->
n
-
(
eol
+
1
-
s
->
buf
));
s
->
n
-=
(
eol
+
1
-
s
->
buf
);
}
else
{
s
->
n
=
0
;
if
(
s
->
n
==
0
)
{
free
(
s
->
buf
);
s
->
buf
=
NULL
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment