diff options
| author | Paul Eggert | 2017-05-31 22:38:04 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-05-31 22:38:32 -0700 |
| commit | 877e808440d4bc2e62d6fb509defee91a3fdc895 (patch) | |
| tree | 5e4d1438d3078a6aa33ff8494a7e624b45534e57 /lib-src | |
| parent | c221f1466ed7e0f11f142d9cb3c0247b10e511c6 (diff) | |
| download | emacs-877e808440d4bc2e62d6fb509defee91a3fdc895.tar.gz emacs-877e808440d4bc2e62d6fb509defee91a3fdc895.zip | |
Free cwd when no longer needed
* lib-src/emacsclient.c (main): Don’t dally when freeing cwd.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/emacsclient.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 3a0715f137e..8828b7652de 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c | |||
| @@ -208,7 +208,7 @@ char *get_current_dir_name (void); | |||
| 208 | /* Return the current working directory. Returns NULL on errors. | 208 | /* Return the current working directory. Returns NULL on errors. |
| 209 | Any other returned value must be freed with free. This is used | 209 | Any other returned value must be freed with free. This is used |
| 210 | only when get_current_dir_name is not defined on the system. */ | 210 | only when get_current_dir_name is not defined on the system. */ |
| 211 | char* | 211 | char * |
| 212 | get_current_dir_name (void) | 212 | get_current_dir_name (void) |
| 213 | { | 213 | { |
| 214 | char *buf; | 214 | char *buf; |
| @@ -1702,6 +1702,7 @@ main (int argc, char **argv) | |||
| 1702 | if (tramp_prefix) | 1702 | if (tramp_prefix) |
| 1703 | quote_argument (emacs_socket, tramp_prefix); | 1703 | quote_argument (emacs_socket, tramp_prefix); |
| 1704 | quote_argument (emacs_socket, cwd); | 1704 | quote_argument (emacs_socket, cwd); |
| 1705 | free (cwd); | ||
| 1705 | send_to_emacs (emacs_socket, "/"); | 1706 | send_to_emacs (emacs_socket, "/"); |
| 1706 | send_to_emacs (emacs_socket, " "); | 1707 | send_to_emacs (emacs_socket, " "); |
| 1707 | 1708 | ||
| @@ -1945,8 +1946,6 @@ main (int argc, char **argv) | |||
| 1945 | if (rl < 0) | 1946 | if (rl < 0) |
| 1946 | exit_status = EXIT_FAILURE; | 1947 | exit_status = EXIT_FAILURE; |
| 1947 | 1948 | ||
| 1948 | free (cwd); /* Keep leak checkers happy. */ | ||
| 1949 | |||
| 1950 | CLOSE_SOCKET (emacs_socket); | 1949 | CLOSE_SOCKET (emacs_socket); |
| 1951 | return exit_status; | 1950 | return exit_status; |
| 1952 | } | 1951 | } |