Skip to content

Commit 1484893

Browse files
committed
Update string_buffer dependency
1 parent 057c130 commit 1484893

2 files changed

Lines changed: 35 additions & 34 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
### v0.1.11
44

5+
* Maintenance: Update string_buffer dependency
56
* Added void to no arg functions
67
* Added static to internal functions
78
* Adding lint checks as part of build

src/scriptexec.c

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "fsio.h"
22
#include "scriptexec.h"
3-
#include "string_buffer.h"
3+
#include "stringbuffer.h"
44
#include <stddef.h>
55
#include <stdio.h>
66
#include <stdlib.h>
@@ -40,52 +40,52 @@ struct ScriptExecResult scriptexec_run_with_options(const char *script, struct S
4040
return(result);
4141
}
4242

43-
struct StringBuffer *buffer = string_buffer_new();
43+
struct StringBuffer *buffer = stringbuffer_new();
4444

4545
// move to cwd
4646
char *cwd = getcwd(NULL, 0);
47-
string_buffer_append_string(buffer, "cd ");
48-
string_buffer_append_string(buffer, cwd);
47+
stringbuffer_append_string(buffer, "cd ");
48+
stringbuffer_append_string(buffer, cwd);
4949
free(cwd);
50-
string_buffer_append(buffer, '\n');
50+
stringbuffer_append(buffer, '\n');
5151

5252
// move to requested working directory
5353
if (options.working_directory != NULL)
5454
{
55-
string_buffer_append_string(buffer, "cd ");
56-
string_buffer_append_string(buffer, options.working_directory);
57-
string_buffer_append(buffer, '\n');
55+
stringbuffer_append_string(buffer, "cd ");
56+
stringbuffer_append_string(buffer, options.working_directory);
57+
stringbuffer_append(buffer, '\n');
5858
}
5959

6060
if (options.exit_on_error)
6161
{
62-
string_buffer_append_string(buffer, "set -e\n");
62+
stringbuffer_append_string(buffer, "set -e\n");
6363
}
6464

6565
if (options.print_commands)
6666
{
67-
string_buffer_append_string(buffer, "set -x\n");
67+
stringbuffer_append_string(buffer, "set -x\n");
6868
}
6969

70-
string_buffer_append_string(buffer, (char *)script);
71-
char *updated_script = string_buffer_to_string(buffer);
70+
stringbuffer_append_string(buffer, (char *)script);
71+
char *updated_script = stringbuffer_to_string(buffer);
7272

7373
char template[] = "/tmp/scriptexec_XXXXXX";
7474
char *dir_name = mkdtemp(template);
7575

7676
if (dir_name == NULL)
7777
{
78-
string_buffer_release(buffer);
78+
stringbuffer_release(buffer);
7979
free(updated_script);
8080

8181
result.code = -1;
8282
return(result);
8383
}
8484

85-
string_buffer_clear(buffer);
86-
string_buffer_append_string(buffer, dir_name);
87-
string_buffer_append_string(buffer, "/script");
88-
char *script_file = string_buffer_to_string(buffer);
85+
stringbuffer_clear(buffer);
86+
stringbuffer_append_string(buffer, dir_name);
87+
stringbuffer_append_string(buffer, "/script");
88+
char *script_file = stringbuffer_to_string(buffer);
8989

9090
// write script file
9191
bool written = fsio_write_text_file(script_file, updated_script);
@@ -94,37 +94,37 @@ struct ScriptExecResult scriptexec_run_with_options(const char *script, struct S
9494
{
9595
rmdir(dir_name);
9696

97-
string_buffer_release(buffer);
97+
stringbuffer_release(buffer);
9898
free(script_file);
9999

100100
result.code = -1;
101101
return(result);
102102
}
103103

104-
string_buffer_append_string(buffer, ".out");
105-
char *out_file = string_buffer_to_string(buffer);
104+
stringbuffer_append_string(buffer, ".out");
105+
char *out_file = stringbuffer_to_string(buffer);
106106

107-
string_buffer_clear(buffer);
108-
string_buffer_append_string(buffer, script_file);
109-
string_buffer_append_string(buffer, ".err");
110-
char *err_file = string_buffer_to_string(buffer);
107+
stringbuffer_clear(buffer);
108+
stringbuffer_append_string(buffer, script_file);
109+
stringbuffer_append_string(buffer, ".err");
110+
char *err_file = stringbuffer_to_string(buffer);
111111

112112
// create command
113113
char *runner = options.runner;
114114
if (runner == NULL)
115115
{
116116
runner = "sh";
117117
}
118-
string_buffer_clear(buffer);
119-
string_buffer_append_string(buffer, runner);
120-
string_buffer_append(buffer, ' ');
121-
string_buffer_append_string(buffer, script_file);
122-
string_buffer_append_string(buffer, " 2> ");
123-
string_buffer_append_string(buffer, err_file);
124-
string_buffer_append_string(buffer, " 1> ");
125-
string_buffer_append_string(buffer, out_file);
126-
char *command = string_buffer_to_string(buffer);
127-
string_buffer_release(buffer);
118+
stringbuffer_clear(buffer);
119+
stringbuffer_append_string(buffer, runner);
120+
stringbuffer_append(buffer, ' ');
121+
stringbuffer_append_string(buffer, script_file);
122+
stringbuffer_append_string(buffer, " 2> ");
123+
stringbuffer_append_string(buffer, err_file);
124+
stringbuffer_append_string(buffer, " 1> ");
125+
stringbuffer_append_string(buffer, out_file);
126+
char *command = stringbuffer_to_string(buffer);
127+
stringbuffer_release(buffer);
128128

129129
result.code = system(command);
130130
free(command);

0 commit comments

Comments
 (0)