Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
ae002768
Commit
ae002768
authored
Jan 30, 2014
by
Martin Blix Grydeland
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve -n and -N VSM handling.
This makes sure that VSM_Name always has something sensible to return.
parent
fafe4334
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
25 deletions
+35
-25
vsm.c
lib/libvarnishapi/vsm.c
+34
-24
vsm_api.h
lib/libvarnishapi/vsm_api.h
+1
-1
No files found.
lib/libvarnishapi/vsm.c
View file @
ae002768
...
...
@@ -69,6 +69,7 @@ VSM_New(void)
if
(
vd
==
NULL
)
return
(
vd
);
REPLACE
(
vd
->
name
,
""
);
vd
->
vsm_fd
=
-
1
;
CHECK_OBJ_NOTNULL
(
vd
,
VSM_MAGIC
);
...
...
@@ -126,38 +127,45 @@ VSM_ResetError(struct VSM_data *vd)
/*--------------------------------------------------------------------*/
int
VSM_n_Arg
(
struct
VSM_data
*
vd
,
const
char
*
opt
)
VSM_n_Arg
(
struct
VSM_data
*
vd
,
const
char
*
arg
)
{
char
*
name
=
NULL
;
char
*
fname
=
NULL
;
CHECK_OBJ_NOTNULL
(
vd
,
VSM_MAGIC
);
AN
(
opt
);
if
(
vd
->
fname
)
{
if
(
vd
->
head
)
return
(
vsm_diag
(
vd
,
"VSM_n_Arg: Already open
\n
"
));
if
(
VIN_N_Arg
(
arg
,
&
name
,
NULL
,
&
fname
))
return
(
vsm_diag
(
vd
,
"Invalid instance name: %s
\n
"
,
strerror
(
errno
)));
AN
(
name
);
AN
(
fname
);
if
(
vd
->
name
)
free
(
vd
->
name
);
vd
->
name
=
name
;
if
(
vd
->
fname
)
free
(
vd
->
fname
);
vd
->
fname
=
NULL
;
}
vd
->
fname
=
fname
;
vd
->
N_opt
=
0
;
REPLACE
(
vd
->
n_opt
,
opt
);
if
(
VIN_N_Arg
(
vd
->
n_opt
,
NULL
,
NULL
,
&
vd
->
fname
))
return
(
vsm_diag
(
vd
,
"Invalid instance name: %s
\n
"
,
strerror
(
errno
)));
return
(
1
);
}
/*--------------------------------------------------------------------*/
int
VSM_N_Arg
(
struct
VSM_data
*
vd
,
const
char
*
opt
)
VSM_N_Arg
(
struct
VSM_data
*
vd
,
const
char
*
arg
)
{
CHECK_OBJ_NOTNULL
(
vd
,
VSM_MAGIC
);
AN
(
opt
);
AN
(
arg
);
if
(
vd
->
n_opt
)
{
free
(
vd
->
n_opt
);
vd
->
n_opt
=
NULL
;
}
REPLACE
(
vd
->
fname
,
opt
);
if
(
vd
->
head
)
return
(
vsm_diag
(
vd
,
"VSM_N_Arg: Already open
\n
"
));
REPLACE
(
vd
->
name
,
arg
);
REPLACE
(
vd
->
fname
,
arg
);
vd
->
N_opt
=
1
;
return
(
1
);
}
...
...
@@ -170,7 +178,7 @@ VSM_Name(const struct VSM_data *vd)
CHECK_OBJ_NOTNULL
(
vd
,
VSM_MAGIC
);
return
(
vd
->
n
_opt
);
return
(
vd
->
n
ame
);
}
/*--------------------------------------------------------------------*/
...
...
@@ -182,11 +190,11 @@ VSM_Delete(struct VSM_data *vd)
CHECK_OBJ_NOTNULL
(
vd
,
VSM_MAGIC
);
VSM_Close
(
vd
);
free
(
vd
->
n_opt
);
free
(
vd
->
fname
);
if
(
vd
->
vsc
!=
NULL
)
VSC_Delete
(
vd
);
VSM_ResetError
(
vd
);
free
(
vd
->
name
);
free
(
vd
->
fname
);
FREE_OBJ
(
vd
);
}
...
...
@@ -214,11 +222,13 @@ VSM_Open(struct VSM_data *vd)
/* Already open */
return
(
0
);
if
(
!
vd
->
n_opt
&&
!
vd
->
N_opt
)
(
void
)
VSM_n_Arg
(
vd
,
""
);
AZ
(
vd
->
head
);
AN
(
vd
->
fname
);
if
(
vd
->
fname
==
NULL
)
{
/* Use default (hostname) */
i
=
VSM_n_Arg
(
vd
,
""
);
if
(
i
<
0
)
return
(
i
);
AN
(
vd
->
fname
);
}
vd
->
vsm_fd
=
open
(
vd
->
fname
,
O_RDONLY
);
if
(
vd
->
vsm_fd
<
0
)
...
...
lib/libvarnishapi/vsm_api.h
View file @
ae002768
...
...
@@ -39,7 +39,7 @@ struct VSM_data {
struct
vsb
*
diag
;
char
*
n
_opt
;
char
*
n
ame
;
char
*
fname
;
int
N_opt
;
...
...
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