diff options
author | John Sullivan <sullivan@src.gnome.org> | 2001-03-07 02:13:57 +0000 |
---|---|---|
committer | John Sullivan <sullivan@src.gnome.org> | 2001-03-07 02:13:57 +0000 |
commit | 45ac4b84850938b6ca4ba2805c2c99aaf03a01d4 (patch) | |
tree | c7482df8dd215feb5271a22b2bd207e0cb38cdce | |
parent | d7f6b9326da19a32259ab62cfec81fc048724ad4 (diff) | |
download | yelp-nautilus-1-0-1.tar.gz |
Merge from HEAD:NAUTILUS_1_0_2NAUTILUS_1_0_1_ANCHORNAUTILUS_1_0_1_1NAUTILUS_1_0nautilus-1-0-1nautilus-1
==============================================================
From 2001-03-06 Darin Adler <darin@eazel.com>
Fixed bug 7328 (info pages no longer work):
* components/help/converters/gnome-info2html2/main.c: (main):
Fixed broken logic for handling both bzip and gzip.
==============================================================
From 2001-03-06 Michael Engber <engber@eazel.com>
* libnautilus-extensions/nautilus-bonobo-extensions.h:
Added NAUTILUS_BONOBO_X_BOILERPLATE.
* libnautilus-extensions/nautilus-directory-metafile-monitor.c:
(nautilus_metafile_monitor_class_init),
(nautilus_metafile_monitor_init):
* libnautilus-extensions/nautilus-directory-metafile-monitor.h:
* libnautilus-extensions/nautilus-metafile-factory.c:
(nautilus_metafile_factory_class_init),
(nautilus_metafile_factory_init):
* libnautilus-extensions/nautilus-metafile-factory.h:
* libnautilus-extensions/nautilus-metafile.c:
(nautilus_metafile_class_init), (nautilus_metafile_init):
* libnautilus-extensions/nautilus-metafile.h:
Switched NautilusMetafile, MetafileMonitor, and Metafile factory
to be based on BonoboXObject - this causes our corba object to
get freed properly - bug 7335.
==============================================================
-rw-r--r-- | src/info2html/main.c | 88 |
1 files changed, 49 insertions, 39 deletions
diff --git a/src/info2html/main.c b/src/info2html/main.c index 63334df3..33813973 100644 --- a/src/info2html/main.c +++ b/src/info2html/main.c @@ -44,9 +44,9 @@ int main(int argc, char **argv) { gzFile f = NULL; + int bz = 0; #ifdef HAVE_LIBBZ2 BZFILE *bf=NULL; - int bz = 0; #endif char line[250]; poptContext ctx; @@ -168,47 +168,57 @@ main(int argc, char **argv) /* No need to store all nodes, etc since we let web server */ /* handle resolving tags! */ for (;1 || !foundit || !requested_nodename;) { -#ifdef HAVE_LIBBZ2 - if(bz && !bf) { - if(args && args[curarg]) - { - bf = bzopen(args[curarg++], "r"); - if(!f) - break; - num_files_left = args[curarg]?1:0; - for(work_line_number = 0, bzread(bf, line, sizeof(line)); *line != INFO_COOKIE; - bzread(bf, line, sizeof(line)), work_line_number++) - /**/ ; - } - else - break; - } - if(!bzread(bf, line, sizeof(line))) + if(bz) { - bzclose(bf); - bf = NULL; - continue; - } +#ifdef HAVE_LIBBZ2 + if(!bf) + { + if(args && args[curarg]) + { + bf = bzopen(args[curarg++], "r"); + if(!f) + break; + num_files_left = args[curarg]?1:0; + for(work_line_number = 0, bzread(bf, line, sizeof(line)); *line != INFO_COOKIE; + bzread(bf, line, sizeof(line)), work_line_number++) + /**/ ; + } + else + break; + } + if(!bzread(bf, line, sizeof(line))) + { + bzclose(bf); + bf = NULL; + continue; + } +#else + g_assert_not_reached(); #endif - if(!f) { - if(args && args[curarg]) - { - f = gzopen(args[curarg++], "r"); - if(!f) - break; - num_files_left = args[curarg]?1:0; - for(work_line_number = 0, gzgets(f, line, sizeof(line)); *line != INFO_COOKIE; - gzgets(f, line, sizeof(line)), work_line_number++) - /**/ ; - } - else - break; - } - if(!gzgets(f, line, sizeof(line))) + } + else { - gzclose(f); - f = NULL; - continue; + if(!f) + { + if(args && args[curarg]) + { + f = gzopen(args[curarg++], "r"); + if(!f) + break; + num_files_left = args[curarg]?1:0; + for(work_line_number = 0, gzgets(f, line, sizeof(line)); *line != INFO_COOKIE; + gzgets(f, line, sizeof(line)), work_line_number++) + /**/ ; + } + else + break; + } + if(!gzgets(f, line, sizeof(line))) + { + gzclose(f); + f = NULL; + continue; + } } work_line_number++; |