HelenOSHelenOS-docHelenOS-historic

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /trunk/kernel/generic/ @ 4011

  → /trunk/kernel/generic/ @ 4012

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 4011 → Rev 4012

/trunk/kernel/generic/include/string.h
43,6 → 43,9
extern void strncpy(char *dest, const char *src, size_t len);
extern char *strcpy(char *dest, const char *src);
extern char *strchr(const char *s, int i);
extern char *strrchr(const char *s, int i);
#endif
/** @}

/trunk/kernel/generic/src/main/kinit.c
64,6 → 64,8
#include <security/cap.h>
#include <lib/rd.h>
#include <ipc/ipc.h>
#include <debug.h>
#include <string.h>
#ifdef CONFIG_SMP
#include <smp/smp.h>
78,6 → 80,9
static char alive[ALIVE_CHARS] = "-\\|/";
#endif
#define BOOT_PREFIX "boot:"
#define BOOT_PREFIX_LEN 5
/** Kernel initialization thread.
*
* kinit takes care of higher level kernel
175,11 → 180,23
continue;
}
char *name = init.tasks[i].name;
if (name[0] == '\0') name = "init-bin";
/*
* Construct task name from the 'boot:' prefix and the
* name stored in the init structure (if any).
*/
char namebuf[TASK_NAME_BUFLEN], *name;
name = init.tasks[i].name;
if (name[0] == '\0') name = "<unknown>";
ASSERT(TASK_NAME_BUFLEN >= BOOT_PREFIX_LEN);
strncpy(namebuf, BOOT_PREFIX, TASK_NAME_BUFLEN);
strncpy(namebuf + BOOT_PREFIX_LEN, name,
TASK_NAME_BUFLEN - BOOT_PREFIX_LEN);
int rc = program_create_from_image((void *) init.tasks[i].addr,
name, &programs[i]);
namebuf, &programs[i]);
if ((rc == 0) && (programs[i].task != NULL)) {
/*

/trunk/kernel/generic/src/lib/string.c
161,5 → 161,46
return orig;
}
/** Find first occurence of character in string.
*
* @param s String to search.
* @param i Character to look for.
*
* @return Pointer to character in @a s or NULL if not found.
*/
extern char *strchr(const char *s, int i)
{
while (*s != '\0') {
if (*s == i) return (char *) s;
++s;
}
return NULL;
}
/** Find last occurence of character in string.
*
* @param s String to search.
* @param i Character to look for.
*
* @return Pointer to character in @a s or NULL if not found.
*/
extern char *strrchr(const char *s, int i)
{
const char *start;
start = s;
if (*s == '\0') return NULL;
while (*s != '\0') ++s;
while (s != start) {
--s;
if (*s == i) return (char *) s;
}
return NULL;
}
/** @}
*/