lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-10 06:23:01 +03:00
Code Activity

Resolved the string_free issue by coding it. I also made some

Browse Source 
documentations of the string module.


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@156 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Aris Adamantiadis
2008-05-12 21:20:00 +00:00
parent f084f6e67c
commit 6a80f1a049
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/libssh/libssh.h
View File

@@ -153,6 +153,7 @@ STRING *string_copy(STRING *str);
/* burns the data inside a string */
void string_burn(STRING *str);
void *string_data(STRING *str);
void string_free(STRING *str);
/* deprecated */
void ssh_crypto_init();

40
libssh/string.c
View File

@@ -1,7 +1,7 @@
/*string.c */
/* string manipulations... */
/*
Copyright 2003 Aris Adamantiadis
Copyright 2003-2008 Aris Adamantiadis
This file is part of the SSH Library
@@ -24,7 +24,17 @@ MA 02111-1307, USA. */
#include <unistd.h>
#include <string.h>
#include "libssh/priv.h"
/** defgroup ssh_string
* \brief string manipulations
*/
/** \addtogroup ssh_string
* @{ */
/**
* \brief Creates a new SSH String object
* \param size size of the string
* \return the newly allocated string
*/
STRING *string_new(unsigned int size){
STRING *str=malloc(size + 4);
str->size=htonl(size);
@@ -35,6 +45,12 @@ void string_fill(STRING *str,void *data,int len){
memcpy(str->string,data,len);
}
/**
* \brief Creates a ssh stream using a C string
* \param what source 0-terminated C string
* \return the newly allocated string.
* \warning The nul byte is not copied nor counted in the ouput string.
*/
STRING *string_from_char(char *what){
STRING *ptr;
int len=strlen(what);
@@ -44,10 +60,22 @@ STRING *string_from_char(char *what){
return ptr;
}
/**
* \brief returns the size of a SSH string
* \param str the input SSH string
* \return size of the content of str
*/
int string_len(STRING *str){
return ntohl(str->size);
}
/**
* \brief convert a SSH string to a C nul-terminated string
* \param str the input SSH string
* \return a malloc'ed string pointer.
* \warning If the input SSH string contains zeroes, some parts of
* the output string may not be readable with regular libc functions.
*/
char *string_to_char(STRING *str){
int len=ntohl(str->size)+1;
char *string=malloc(len);
@@ -70,3 +98,13 @@ void string_burn(STRING *s){
void *string_data(STRING *s){
return s->string;
}
/**
* \brief desallocate a STRING object
* \param s String to delete
*/
void string_free(STRING *s){
free(s);
}
/** @} */