diff --git a/src/include/66/constants.h b/src/include/66/constants.h
index 5d7439cdd43ad767f8c1dcc51329fb0f47f49dbd..b52bc373418e9cc60e4e1856dad6f64072acef30 100644
--- a/src/include/66/constants.h
+++ b/src/include/66/constants.h
@@ -74,7 +74,7 @@
#define SS_SWBACK 1 //switch to backup
/** environment and data */
-#define SS_ENVDIR "/env"
+#define SS_ENVDIR "/conf"
#define SS_ENVDIR_LEN (sizeof SS_ENVDIR - 1)
#define SS_DATADIR "/data"
#define SS_DATADIR_LEN (sizeof SS_DATADIR - 1)
diff --git a/src/include/66/parser.h b/src/include/66/parser.h
index eb60961e53a39e682df3a34aa839171e1bbe3edf..a0f5c49dfe83cc1c709fa4dab982516d49e0ddec 100644
--- a/src/include/66/parser.h
+++ b/src/include/66/parser.h
@@ -330,7 +330,7 @@ extern int write_consprod(sv_alltype *sv,char const *prodname,char const *consna
extern int write_dependencies(char const *src, sv_name_t *cname,char const *dst,char const *filename, genalloc *ga, unsigned int force) ;
-extern int write_env(genalloc *env,stralloc *sa,char const *dst) ;
+extern int write_env(char const *name, genalloc *env,stralloc *sa,char const *dst) ;
extern void freed_parser(void) ;
diff --git a/src/lib66/parser_write.c b/src/lib66/parser_write.c
index 56cd136c8dfcba16c92b8b74bd69c7ac12703edd..86d20a0a1b00867a8e16a79e99e37a3c8a833c5b 100644
--- a/src/lib66/parser_write.c
+++ b/src/lib66/parser_write.c
@@ -752,18 +752,28 @@ int write_common(sv_alltype *sv, char const *dst)
/** environment */
if (sv->opts[2])
{
+ stralloc sa = STRALLOC_ZERO ;
+ if (!set_ownersysdir(&sa,MYUID))
+ {
+ VERBO3 strerr_warnwu1sys("get home system directory") ;
+ return 0 ;
+ }
+
/** /etc/env/sv_name*/
- size_t sslen = strlen(SS_SERVICEDIR) - 1 ;
+ size_t sslen = sa.len - 2 ;//-2 remove 0 and '/'
char *name = keep.s + sv->cname.name ;
size_t namelen = strlen(name) ;
- char dst[sslen + SS_ENVDIR_LEN + 1 + namelen + 1] ;
- memcpy(dst,SS_SERVICEDIR,sslen) ;
+ char dst[sslen + SS_ENVDIR_LEN + 1] ;
+ memcpy(dst,sa.s,sslen) ;
memcpy(dst + sslen,SS_ENVDIR,SS_ENVDIR_LEN) ;
dst[sslen + SS_ENVDIR_LEN] = 0 ;
+
+ stralloc_free(&sa) ;
+
r = scan_mode(dst,S_IFDIR) ;
if (r < 0)
{
- VERBO3 strerr_warnwu2sys("invalid environment directory: ",dst) ;
+ VERBO3 strerr_warnw2sys("invalid environment directory: ",dst) ;
return 0 ;
}
if (!r)
@@ -774,12 +784,8 @@ int write_common(sv_alltype *sv, char const *dst)
return 0 ;
}
}
-
- dst[sslen + SS_ENVDIR_LEN] = '/' ;
- memcpy(dst + sslen + SS_ENVDIR_LEN + 1, name,namelen) ;
- dst[sslen + SS_ENVDIR_LEN + 1 + namelen] = 0 ;
-
- if (!write_env(&sv->env,&saenv,dst))
+
+ if (!write_env(name,&sv->env,&saenv,dst))
{
VERBO3 strerr_warnwu1x("write environment") ;
return 0 ;
@@ -792,10 +798,9 @@ int write_common(sv_alltype *sv, char const *dst)
int write_exec(sv_alltype *sv, sv_exec *exec,char const *file,char const *dst,int mode)
{
- unsigned int key, val ;
unsigned int type = sv->cname.itype ;
char *name = keep.s+sv->cname.name ;
- size_t namelen = strlen(name) ;
+
size_t filelen = strlen(file) ;
size_t dstlen = strlen(dst) ;
char write[dstlen + 1 + filelen + 1] ;
@@ -806,16 +811,21 @@ int write_exec(sv_alltype *sv, sv_exec *exec,char const *file,char const *dst,in
stralloc runuser = STRALLOC_ZERO ;
stralloc execute = STRALLOC_ZERO ;
- key = val = 0 ;
- size_t envdstlen = strlen(SS_SERVICEDIR) - 1;
- char envdata[envdstlen + SS_ENVDIR_LEN + 1 + namelen + 1] ;
- memcpy(envdata,SS_SERVICEDIR,envdstlen) ;
+ stralloc sa = STRALLOC_ZERO ;
+ if (!set_ownersysdir(&sa,MYUID))
+ {
+ VERBO3 strerr_warnwu1sys("get home system directory") ;
+ return 0 ;
+ }
+ size_t envdstlen = sa.len - 2 ;//-2 0 of stra and last '/'
+ char envdata[envdstlen + SS_ENVDIR_LEN + 1] ;
+ memcpy(envdata,sa.s,envdstlen) ;
memcpy(envdata + envdstlen, SS_ENVDIR,SS_ENVDIR_LEN) ;
- envdata[envdstlen + SS_ENVDIR_LEN] = '/' ;
- memcpy(envdata + envdstlen + SS_ENVDIR_LEN + 1, name,namelen) ;
- envdata[envdstlen + SS_ENVDIR_LEN + 1 + namelen] = 0 ;
+ envdata[envdstlen + SS_ENVDIR_LEN] = 0 ;
-
+
+ stralloc_free(&sa) ;
+
switch (exec->build)
{
case AUTO:
@@ -833,31 +843,11 @@ int write_exec(sv_alltype *sv, sv_exec *exec,char const *file,char const *dst,in
/** environment */
if (sv->opts[2] && (exec->build == AUTO))
{
- if (!stralloc_cats(&env,S6_BINPREFIX "s6-envdir ")) retstralloc(0,"write_exec") ;
+ if (!stralloc_cats(&env,S6_BINPREFIX "66-envfile -f ")) retstralloc(0,"write_exec") ;
+ if (!stralloc_cats(&env,name)) retstralloc(0,"write_exec") ;
+ if (!stralloc_cats(&env," ")) retstralloc(0,"write_exec") ;
if (!stralloc_cats(&env,envdata)) retstralloc(0,"write_exec") ;
if (!stralloc_cats(&env,"\n")) retstralloc(0,"write_exec") ;
- if (genalloc_len(diuint32,&sv->env))
- {
- for (unsigned int i = 0 ; i < genalloc_len(diuint32,&sv->env) ; i++)
- {
- key = genalloc_s(diuint32,&sv->env)[i].left ;
- if ((saenv.s+key)[0] == '!')
- {
- if (!stralloc_cats(&env,"importas -uD \"\" ")) retstralloc(0,"write_exec") ;
- if (!stralloc_cats(&env,saenv.s+1+key)) retstralloc(0,"write_exec") ;
- if (!stralloc_cats(&env," ")) retstralloc(0,"write_exec") ;
- if (!stralloc_cats(&env,saenv.s+1+key)) retstralloc(0,"write_exec") ;
- }
- else
- {
- if (!stralloc_cats(&env,"importas -D \"\" ")) retstralloc(0,"write_exec") ;
- if (!stralloc_cats(&env,saenv.s+key)) retstralloc(0,"write_exec") ;
- if (!stralloc_cats(&env," ")) retstralloc(0,"write_exec") ;
- if (!stralloc_cats(&env,saenv.s+key)) retstralloc(0,"write_exec") ;
- }
- if (!stralloc_cats(&env,"\n")) retstralloc(0,"write_exec") ;
- }
- }
}
/** shebang */
if (type != ONESHOT)
@@ -997,14 +987,14 @@ int write_uint(char const *dst, char const *name, uint32_t ui)
return 1 ;
}
-int write_env(genalloc *env,stralloc *sa,char const *dst)
+int write_env(char const *name, genalloc *env,stralloc *sa,char const *dst)
{
int r ;
-
+ stralloc tmp = STRALLOC_ZERO ;
if (genalloc_len(diuint32,env))
{
- unsigned int key = 0 ;
- unsigned int val = 0 ;
+ char *key = 0 ;
+ char *val = 0 ;
r = scan_mode(dst,S_IFDIR) ;
if (r < 0)
{
@@ -1021,23 +1011,22 @@ int write_env(genalloc *env,stralloc *sa,char const *dst)
}
for (unsigned int i = 0 ; i < genalloc_len(diuint32,env) ; i++)
{
- key = genalloc_s(diuint32,env)[i].left ;
- val = genalloc_s(diuint32,env)[i].right ;
+ key = sa->s + genalloc_s(diuint32,env)[i].left ;
+ val = sa->s + genalloc_s(diuint32,env)[i].right ;
- if ((sa->s+key)[0] == '!')
- key++ ;
- /* if (dir_search(dst,sa->s+key,S_IFREG))
- {
- VERBO3 strerr_warnw5x("file: ",dst,"/",sa->s+key," already exist, skip it") ;
- continue ;
- }*/
- if (!file_write_unsafe(dst,sa->s+key,sa->s+val,strlen(sa->s+val)))
- {
- VERBO3 strerr_warnwu4sys("create file: ",dst,"/",sa->s+key) ;
- return 0 ;
- }
+ if (!stralloc_cats(&tmp,key)) retstralloc(0,"write_env") ;
+ if (!stralloc_cats(&tmp,"=")) retstralloc(0,"write_env") ;
+ if (!stralloc_cats(&tmp,val)) retstralloc(0,"write_env") ;
+ if (!stralloc_cats(&tmp,"\n")) retstralloc(0,"write_env") ;
}
}
+ if (!file_write_unsafe(dst,name,tmp.s,tmp.len))
+ {
+ VERBO3 strerr_warnwu4sys("create file: ",dst,"/",name) ;
+ return 0 ;
+ }
+
+ stralloc_free(&tmp) ;
return 1 ;
}