summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Larson <mike@vyatta.com>2011-01-06 16:52:01 -0800
committerMichael Larson <mike@vyatta.com>2011-01-06 16:52:01 -0800
commit3246881725b219e532464a0191d074e9f02cba23 (patch)
tree13b9737a1b3f4842a20110b25cd9087bc47f7d89 /src
parent2e1ce21a485f6b72ca391ded96523b87fd0df1d5 (diff)
downloadvyatta-cfg-3246881725b219e532464a0191d074e9f02cba23.tar.gz
vyatta-cfg-3246881725b219e532464a0191d074e9f02cba23.zip
use the old interface rather than call unlink directly.
Diffstat (limited to 'src')
-rw-r--r--src/cli_new.c2
-rw-r--r--src/cli_val.h1
-rw-r--r--src/commit2.c4
3 files changed, 3 insertions, 4 deletions
diff --git a/src/cli_new.c b/src/cli_new.c
index 2db7996..f746b7f 100644
--- a/src/cli_new.c
+++ b/src/cli_new.c
@@ -330,7 +330,7 @@ void di(vtw_sorted *srtp)
#define LOCK_FILE "/opt/vyatta/config/.lock"
#define COMMIT_CMD "/opt/vyatta/sbin/my_commit"
-static void
+void
release_config_lock()
{
unlink(LOCK_FILE);
diff --git a/src/cli_val.h b/src/cli_val.h
index 7f1f512..022f794 100644
--- a/src/cli_val.h
+++ b/src/cli_val.h
@@ -127,6 +127,7 @@ void mark_paths(vtw_mark *markp);
void restore_paths(vtw_mark *markp);
extern int get_config_lock(void);
+extern void release_config_lock(void);
#define VTWERR_BADPATH -2
#define VTWERR_OK 0
diff --git a/src/commit2.c b/src/commit2.c
index 04aa79a..5cfecc8 100644
--- a/src/commit2.c
+++ b/src/commit2.c
@@ -44,8 +44,6 @@ static const char* ActionNames[top_act] = {
"end" //7
};
-#define LOCK_FILE "/opt/vyatta/config/.lock"
-
GNode*
get_transactions(GNode*, boolean priority);
@@ -203,7 +201,7 @@ main(int argc, char** argv)
commit_comment = strdup(optarg);
break;
case 'l':
- unlink(LOCK_FILE);
+ release_config_lock();
break;
default:
usage();