Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "config.h"
+#include "config.hh"
#include <stdio.h>
#include <assert.h>
#if HAVE_SSTREAM
#include <sstream>
#else
-#include <strstream.h>
+#include <strstream>
#define istringstream(x) istrstream(x, length ())
#endif
contents_str0_ = chs.remove_array ();
}
-
-
-char *
-gulp_file (String fn, int* len)
+char*
+gulp_file (String filename, int *filesize)
{
- /*
- let's hope that "b" opens anything binary, and does not apply
- CR/LF translation
- */
- FILE * f = fopen (fn.to_str0 (), "rb");
-
+ /* "b" must ensure to open literally, avoiding text (CR/LF)
+ conversions. */
+ FILE *f = fopen (filename.to_str0 (), "rb");
if (!f)
{
- warning (_f ("can't open file: `%s'", fn.to_str0 ()));
+ warning (_f ("can't open file: `%s'", filename.to_str0 ()));
return 0;
}
- int ret = fseek (f, 0, SEEK_END);
-
- *len = ftell (f);
+ fseek (f, 0, SEEK_END);
+ *filesize = ftell (f);
rewind (f);
- char * str = new char[*len+1];
- str[*len] = 0;
- ret = fread (str, sizeof (char), *len, f);
- if (ret!=*len)
- warning (_f ("Huh? Got %d, expected %d characters", ret, *len));
+ char *str = new char[*filesize + 1];
+ str[*filesize] = 0;
+ int bytes_read = fread (str, sizeof (char), *filesize, f);
+ if (bytes_read != *filesize)
+ warning (_f ("Huh? Got %d, expected %d characters", bytes_read,
+ *filesize));
fclose (f);
-
return str;
}
-/*
- Unused.
- */
Source_file::Source_file (String filename, String data)
{
name_ = filename;
istream_ = 0;
contents_str0_ = data.get_copy_str0();
- length_ = data.length();
+ length_ = data.length ();
pos_str0_ = to_str0 ();
- init_port();
+ init_port ();
}
Source_file::Source_file (String filename_string)
pos_str0_ = to_str0 ();
- init_port();
+ init_port ();
for (int i = 0; i < length_; i++)
if (contents_str0_[i] == '\n')
void
Source_file::init_port ()
{
- SCM str =scm_makfrom0str (contents_str0_);
-
- str_port_ = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_RDNG,
- __FUNCTION__);
- scm_set_port_filename_x (str_port_,
- scm_makfrom0str (name_.get_str0()));
+ SCM str = scm_makfrom0str (contents_str0_);
+ str_port_ = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_RDNG, __FUNCTION__);
+ scm_set_port_filename_x (str_port_, scm_makfrom0str (name_.get_str0 ()));
}
int
if (!contains (pos_str0))
return 0;
- if (!newline_locations_.size())
+ if (!newline_locations_.size ())
return 1;
int lo=0;
- int hi = newline_locations_.size();
+ int hi = newline_locations_.size ();
if (newline_locations_[lo] > pos_str0)
return 1;