git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Debian: Include ISOFS driver in the kernel.
[libguestfs.git]
/
fish
/
edit.c
diff --git
a/fish/edit.c
b/fish/edit.c
index
5519bb9
..
1b6ce23
100644
(file)
--- a/
fish/edit.c
+++ b/
fish/edit.c
@@
-1,5
+1,5
@@
/* guestfish - the filesystem interactive shell
/* guestfish - the filesystem interactive shell
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-29,26
+29,8
@@
/* guestfish edit command, suggested by Ján Ondrej, implemented by RWMJ */
/* guestfish edit command, suggested by Ján Ondrej, implemented by RWMJ */
-static int
-xwrite (int fd, const void *buf, size_t len)
-{
- int r;
-
- while (len > 0) {
- r = write (fd, buf, len);
- if (r == -1) {
- perror ("write");
- return -1;
- }
- buf += r;
- len -= r;
- }
-
- return 0;
-}
-
static char *
static char *
-load_file (const char *filename,
in
t *len_r)
+load_file (const char *filename,
size_
t *len_r)
{
int fd, r, start;
char *content = NULL, *p;
{
int fd, r, start;
char *content = NULL, *p;
@@
-98,7
+80,7
@@
do_edit (const char *cmd, int argc, char *argv[])
char buf[256];
const char *editor;
char *content, *content_new;
char buf[256];
const char *editor;
char *content, *content_new;
- int r, fd
, size
;
+ int r, fd;
if (argc != 1) {
fprintf (stderr, _("use '%s filename' to edit a file\n"), cmd);
if (argc != 1) {
fprintf (stderr, _("use '%s filename' to edit a file\n"), cmd);
@@
-156,6
+138,7
@@
do_edit (const char *cmd, int argc, char *argv[])
}
/* Reload it. */
}
/* Reload it. */
+ size_t size;
content_new = load_file (filename, &size);
if (content_new == NULL) {
unlink (filename);
content_new = load_file (filename, &size);
if (content_new == NULL) {
unlink (filename);