X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Freopen.c;h=56c189ea54df35eae685d9d23d69ec84fc53764e;hb=0ef30bbb316b50beba511a5eb4bd7174671fa1ca;hp=b07698263ccb6a355f434c4eb3567c456257e387;hpb=6391d1a7cfa10337a75465c72d49df3c9ebc65ca;p=libguestfs.git diff --git a/fish/reopen.c b/fish/reopen.c index b076982..56c189e 100644 --- a/fish/reopen.c +++ b/fish/reopen.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include @@ -31,6 +31,8 @@ run_reopen (const char *cmd, size_t argc, char *argv[]) guestfs_h *g2; int r; const char *p; + guestfs_error_handler_cb cb; + void *cb_data; if (argc > 0) { fprintf (stderr, _("'reopen' command takes no parameters\n")); @@ -50,6 +52,9 @@ run_reopen (const char *cmd, size_t argc, char *argv[]) /* Now copy some of the settings from the old handle. The settings * we copy are those which are set by guestfish itself. */ + cb = guestfs_get_error_handler (g, &cb_data); + guestfs_set_error_handler (g2, cb, cb_data); + r = guestfs_get_verbose (g); if (r >= 0) guestfs_set_verbose (g2, r); @@ -66,8 +71,13 @@ run_reopen (const char *cmd, size_t argc, char *argv[]) if (p) guestfs_set_path (g2, p); + r = guestfs_get_pgroup (g); + if (r >= 0) + guestfs_set_pgroup (g2, r); + if (progress_bars) - guestfs_set_progress_callback (g2, progress_callback, NULL); + guestfs_set_event_callback (g2, progress_callback, + GUESTFS_EVENT_PROGRESS, 0, NULL); /* Close the original handle. */ guestfs_close (g);