-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2006, 2009, 2014 Free Software Foundation, 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
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
*
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice. */
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
\f
/* This is the C part of the (ice-9 rw) module. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <errno.h>
#include <string.h>
#include "libguile/modules.h"
#include "libguile/strports.h"
-#ifdef HAVE_UNISTD_H
#include <unistd.h>
-#endif
#ifdef HAVE_IO_H
#include <io.h>
#endif
#define FUNC_NAME s_scm_read_string_x_partial
{
char *dest;
+ size_t offset;
long read_len;
long chars_read = 0;
int fdes;
{
- long offset;
- long last;
+ size_t last;
- SCM_VALIDATE_SUBSTRING_SPEC_COPY (1, str, dest, 3, start, offset,
- 4, end, last);
- dest += offset;
+ SCM_VALIDATE_STRING (1, str);
+ scm_i_get_substring_spec (scm_i_string_length (str),
+ start, &offset, end, &last);
read_len = last - offset;
}
- if (SCM_INUMP (port_or_fdes))
- fdes = SCM_INUM (port_or_fdes);
+ if (scm_is_integer (port_or_fdes))
+ fdes = scm_to_int (port_or_fdes);
else
{
- SCM port = SCM_UNBNDP (port_or_fdes) ? scm_cur_inp : port_or_fdes;
+ SCM port = (SCM_UNBNDP (port_or_fdes)?
+ scm_current_input_port () : port_or_fdes);
SCM_VALIDATE_OPFPORT (2, port);
SCM_VALIDATE_INPUT_PORT (2, port);
don't touch the file descriptor. otherwise the
"return immediately if something is available" rule may
be violated. */
+ str = scm_i_string_start_writing (str);
+ dest = scm_i_string_writable_chars (str) + offset;
chars_read = scm_take_from_input_buffers (port, dest, read_len);
+ scm_i_string_stop_writing ();
fdes = SCM_FPORT_FDES (port);
}
if (chars_read == 0 && read_len > 0) /* don't confuse read_len == 0 with
EOF. */
{
+ str = scm_i_string_start_writing (str);
+ dest = scm_i_string_writable_chars (str) + offset;
SCM_SYSCALL (chars_read = read (fdes, dest, read_len));
+ scm_i_string_stop_writing ();
if (chars_read == -1)
{
if (SCM_EBLOCK (errno))
SCM_SYSERROR;
}
else if (chars_read == 0)
- return SCM_BOOL_F;
+ {
+ scm_remember_upto_here_1 (str);
+ return SCM_BOOL_F;
+ }
}
- return scm_long2num (chars_read);
+
+ scm_remember_upto_here_1 (str);
+ return scm_from_long (chars_read);
}
#undef FUNC_NAME
"@end itemize")
#define FUNC_NAME s_scm_write_string_partial
{
- char *src;
- long write_len;
+ const char *src;
+ scm_t_off write_len;
int fdes;
{
- long offset;
- long last;
+ size_t offset;
+ size_t last;
- SCM_VALIDATE_SUBSTRING_SPEC_COPY (1, str, src, 3, start, offset,
- 4, end, last);
+ SCM_VALIDATE_STRING (1, str);
+ src = scm_i_string_chars (str);
+ scm_i_get_substring_spec (scm_i_string_length (str),
+ start, &offset, end, &last);
src += offset;
write_len = last - offset;
}
if (write_len == 0)
return SCM_INUM0;
- if (SCM_INUMP (port_or_fdes))
- fdes = SCM_INUM (port_or_fdes);
+ if (scm_is_integer (port_or_fdes))
+ fdes = scm_to_int (port_or_fdes);
else
{
- SCM port = SCM_UNBNDP (port_or_fdes) ? scm_cur_outp : port_or_fdes;
+ SCM port = (SCM_UNBNDP (port_or_fdes)?
+ scm_current_output_port () : port_or_fdes);
scm_t_port *pt;
- off_t space;
+ scm_t_off space;
SCM_VALIDATE_OPFPORT (2, port);
SCM_VALIDATE_OUTPUT_PORT (2, port);
{
memcpy (pt->write_pos, src, write_len);
pt->write_pos += write_len;
- return scm_long2num (write_len);
+ return scm_from_long (write_len);
}
if (pt->write_pos > pt->write_buf)
scm_flush (port);
else
SCM_SYSERROR;
}
-
- return scm_long2num (rv);
+
+ scm_remember_upto_here_1 (str);
+ return scm_from_long (rv);
}
}
#undef FUNC_NAME
HCoop / bpt / guile.git / blobdiff