bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates for mbfile move

Browse Source
This commit is contained in:
Michiel Broek 2002-12-09 21:11:43 +00:00
parent 996c87ab27
commit 3daf91bc3c
2 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mbfido/mbfmove.c
View File

@ -52,7 +52,7 @@ extern int do_quiet; /* Suppress screen output */
*/ */
void Move(int From, int To, char *File) void Move(int From, int To, char *File)
{ {
char *frompath, *topath, *temp1, *temp2, *fromlink, *tolink; char *frompath, *topath, *temp1, *temp2, *fromlink, *tolink, *fromthumb, *tothumb;
struct FILERecord fdb; struct FILERecord fdb;
FILE *fp1, *fp2; FILE *fp1, *fp2;
int rc = FALSE, Found = FALSE; int rc = FALSE, Found = FALSE;
@ -113,10 +113,13 @@ void Move(int From, int To, char *File)
frompath = xstrcpy(area.Path); frompath = xstrcpy(area.Path);
frompath = xstrcat(frompath, (char *)"/"); frompath = xstrcat(frompath, (char *)"/");
frompath = xstrcat(frompath, fdb.LName); frompath = xstrcat(frompath, fdb.Name);
fromlink = xstrcpy(area.Path); fromlink = xstrcpy(area.Path);
fromlink = xstrcat(fromlink, (char *)"/"); fromlink = xstrcat(fromlink, (char *)"/");
fromlink = xstrcat(fromlink, fdb.Name); fromlink = xstrcat(fromlink, fdb.LName);
fromthumb = xstrcpy(area.Path);
fromthumb = xstrcat(fromthumb, (char *)"/.");
fromthumb = xstrcat(fromthumb, fdb.Name);
/* /*
* Check Destination area * Check Destination area
@ -142,10 +145,13 @@ void Move(int From, int To, char *File)
topath = xstrcpy(area.Path); topath = xstrcpy(area.Path);
topath = xstrcat(topath, (char *)"/"); topath = xstrcat(topath, (char *)"/");
topath = xstrcat(topath, fdb.LName); topath = xstrcat(topath, fdb.Name);
tolink = xstrcpy(area.Path); tolink = xstrcpy(area.Path);
tolink = xstrcat(tolink, (char *)"/"); tolink = xstrcat(tolink, (char *)"/");
tolink = xstrcat(tolink, fdb.Name); tolink = xstrcat(tolink, fdb.LName);
tothumb = xstrcpy(area.Path);
tothumb = xstrcat(tothumb, (char *)"/.");
tothumb = xstrcat(tothumb, fdb.Name);
temp2 = calloc(PATH_MAX, sizeof(char)); temp2 = calloc(PATH_MAX, sizeof(char));
sprintf(temp2, "%s/fdb/fdb%d.temp", getenv("MBSE_ROOT"), From); sprintf(temp2, "%s/fdb/fdb%d.temp", getenv("MBSE_ROOT"), From);
@ -164,30 +170,16 @@ void Move(int From, int To, char *File)
if (strcmp(fdb.LName, File) && strcmp(fdb.Name, File)) if (strcmp(fdb.LName, File) && strcmp(fdb.Name, File))
fwrite(&fdb, sizeof(fdb), 1, fp2); fwrite(&fdb, sizeof(fdb), 1, fp2);
else { else {
if (strcmp(fdb.Name, fdb.LName))
rc = AddFile(fdb, To, topath, frompath, tolink); rc = AddFile(fdb, To, topath, frompath, tolink);
else
rc = AddFile(fdb, To, topath, frompath, NULL);
if (rc) { if (rc) {
/*
* Remove old 8.3 name
*/
if (strcmp(fdb.Name, fdb.LName))
unlink(fromlink); unlink(fromlink);
unlink(frompath);
/* /*
* Try to move thumbnail if it exists * Try to move thumbnail if it exists
*/ */
unlink(frompath); if (file_exist(fromthumb, R_OK) == 0) {
free(frompath); file_mv(fromthumb, tothumb);
free(topath);
frompath = xstrcpy(area.Path);
frompath = xstrcat(frompath, (char *)"/.");
frompath = xstrcat(frompath, File);
topath = xstrcpy(area.Path);
topath = xstrcat(topath, (char *)"/.");
topath = xstrcat(topath, File);
if (file_exist(frompath, R_OK) == 0) {
file_mv(frompath, topath);
} }
} }
} }
@ -226,8 +218,10 @@ void Move(int From, int To, char *File)
free(temp2); free(temp2);
free(frompath); free(frompath);
free(fromlink); free(fromlink);
free(fromthumb);
free(topath); free(topath);
free(tolink); free(tolink);
free(tothumb);
} }

6
mbfido/mbfutil.c
View File

@ -328,10 +328,10 @@ int AddFile(struct FILERecord fdb, int Area, char *DestPath, char *FromPath, cha
} }
chmod(DestPath, 0644); chmod(DestPath, 0644);
if (LinkPath) { if (LinkPath) {
if ((rc = link(DestPath, LinkPath))) { if ((rc = symlink(DestPath, LinkPath))) {
WriteError("Can't create link %s", LinkPath); WriteError("Can't create symbolic link %s", LinkPath);
if (!do_quiet) if (!do_quiet)
printf("Can't create link %s, %s\n", LinkPath, strerror(rc)); printf("Can't create symbolic link %s, %s\n", LinkPath, strerror(rc));
unlink(DestPath); unlink(DestPath);
return FALSE; return FALSE;
} }