diff options
author | Thomas E. Dickey <dickey@invisible-island.net> | 1998-04-23 12:35:00 -0400 |
---|---|---|
committer | Thomas E. Dickey <dickey@invisible-island.net> | 1998-04-23 12:35:00 -0400 |
commit | 2a94396ccd9cf5ade728c53e02cba28e06af4378 (patch) | |
tree | 0ee1558f3e81f97725d83250f944aafa4eb43d54 /src/LYBookmark.c | |
parent | 84271e583d80f546251ea914a33f8c537fddbac7 (diff) | |
download | lynx-snapshots-2a94396ccd9cf5ade728c53e02cba28e06af4378.tar.gz |
snapshot of project "lynx", label v2-8-1dev_7
Diffstat (limited to 'src/LYBookmark.c')
-rw-r--r-- | src/LYBookmark.c | 296 |
1 files changed, 148 insertions, 148 deletions
diff --git a/src/LYBookmark.c b/src/LYBookmark.c index 5ce5c754..8416563b 100644 --- a/src/LYBookmark.c +++ b/src/LYBookmark.c @@ -18,7 +18,7 @@ #ifdef VMS #include <HTVMSUtils.h> #include <nam.h> -extern BOOLEAN HadVMSInterrupt; /* Flag from cleanup_sig() AST */ +extern BOOLEAN HadVMSInterrupt; /* Flag from cleanup_sig() AST */ #endif /* VMS */ #include <LYLeaks.h> @@ -54,15 +54,15 @@ PUBLIC char * get_bookmark_filename ARGS1( int MBM_tmp; /* - * Multi_Bookmarks support. - FMG & FM - * Let user select a bookmark file. + * Multi_Bookmarks support. - FMG & FM + * Let user select a bookmark file. */ MBM_tmp = select_multi_bookmarks(); if (MBM_tmp == -2) - /* + /* * Zero-length pointer flags a cancel. - FM - */ - return(""); + */ + return(""); if (MBM_tmp == -1) { sprintf(string_buffer, BOOKMARK_FILE_NOT_DEFINED, @@ -74,7 +74,7 @@ PUBLIC char * get_bookmark_filename ARGS1( */ return(" "); } else { - /* + /* * Save the filepath as a global. The system path will be * loaded into to the (static) filename_buffer as the return * value, the URL will be allocated into *URL, and we also @@ -86,28 +86,27 @@ PUBLIC char * get_bookmark_filename ARGS1( } /* - * Seek it in the home path. - FM + * Seek it in the home path. - FM */ filename_buffer[255] = '\0'; LYAddPathToHome(filename_buffer, sizeof(filename_buffer), BookmarkPage); - if (TRACE) - fprintf(stderr, "\nget_bookmark_filename: SEEKING %s\n AS %s\n\n", + CTRACE(tfp, "\nget_bookmark_filename: SEEKING %s\n AS %s\n\n", BookmarkPage, filename_buffer); if ((fp = fopen(filename_buffer,"r")) != NULL) { goto success; } /* - * Failure. + * Failure. */ return(NULL); success: /* - * We now have the file open. - * Check if it is a mosaic hotlist. + * We now have the file open. + * Check if it is a mosaic hotlist. */ if (fgets(string_buffer, 255, fp) && !strncmp(string_buffer, "ncsa-xmosaic-hotlist-format-1", 29)) { @@ -126,23 +125,31 @@ success: sprintf(URL_buffer,"file://localhost%s", HTVMS_wwwName((char *)newname)); #else +#ifdef __EMX__ + sprintf(URL_buffer,"file://localhost/%s", newname); +#else sprintf(URL_buffer,"file://localhost%s", newname); +#endif /* __EMX__ */ #endif /* VMS */ #endif /* DOSPATH */ } else { fclose(fp); is_mosaic_hotlist = FALSE; #ifdef DOSPATH - sprintf(URL_buffer,"file://localhost/%s", + sprintf(URL_buffer,"file://localhost/%s", HTDOS_wwwName((char *)filename_buffer)); #else #ifdef VMS sprintf(URL_buffer,"file://localhost%s", - HTVMS_wwwName((char *)filename_buffer)); + HTVMS_wwwName((char *)filename_buffer)); +#else +#ifdef __EMX__ + sprintf(URL_buffer,"file://localhost/%s", filename_buffer); #else sprintf(URL_buffer,"file://localhost%s", filename_buffer); +#endif /* __EMX__ */ #endif /* VMS */ -#endif /* DOSPATH */ +#endif /* DOSPATH */ } StrAllocCopy(*URL, URL_buffer); @@ -155,7 +162,7 @@ success: * file for handling as a Lynx bookmark file. - FM */ PRIVATE char * convert_mosaic_bookmark_file ARGS1( - char *, filename_buffer) + char *, filename_buffer) { static char newfile[256]; static BOOLEAN first = TRUE; @@ -165,16 +172,16 @@ PRIVATE char * convert_mosaic_bookmark_file ARGS1( char *endline; if (first) { - tempname(newfile, NEW_FILE); + tempname(newfile, NEW_FILE); first = FALSE; #ifdef VMS } else { - remove(newfile); /* Remove duplicates on VMS. */ + remove(newfile); /* Remove duplicates on VMS. */ #endif /* VMS */ } if ((nfp = fopen(newfile, "w")) == NULL) { - LYMBM_statusline(NO_TEMP_FOR_HOTLIST); + LYMBM_statusline(NO_TEMP_FOR_HOTLIST); sleep(AlertSecs); return (""); } @@ -197,12 +204,12 @@ PRIVATE char * convert_mosaic_bookmark_file ARGS1( if((line % 2) == 0) { /* even lines */ if(*buf != '\0') { strtok(buf," "); /* kill everything after the space */ - fprintf(nfp,"<LI><a href=\"%s\">",buf); /* the URL */ + fprintf(nfp,"<LI><a href=\"%s\">",buf); /* the URL */ } } else { /* odd lines */ - fprintf(nfp,"%s</a>\n",buf); /* the title */ + fprintf(nfp,"%s</a>\n",buf); /* the title */ } - } + } /* else - ignore the line (this gets rid of first two lines) */ line++; } @@ -219,8 +226,8 @@ PRIVATE char * convert_mosaic_bookmark_file ARGS1( * to that file. - FM */ PUBLIC void save_bookmark_link ARGS2( - char *, address, - char *, title) + char *, address, + char *, title) { FILE *fp; BOOLEAN first_time = FALSE; @@ -236,32 +243,32 @@ PUBLIC void save_bookmark_link ARGS2( HText *text; /* - * Make sure we were passed something to save. - FM + * Make sure we were passed something to save. - FM */ if (!(address && *address)) { - HTAlert(MALFORMED_ADDRESS); + HTAlert(MALFORMED_ADDRESS); return; } /* - * Offer a choice of bookmark files, - * or get the default. - FMG + * Offer a choice of bookmark files, + * or get the default. - FMG */ filename = get_bookmark_filename(&bookmark_URL); /* - * If filename is NULL, must create a new file. If - * filename is a space, an invalid bookmark file was - * selected, or if zero-length, the user cancelled. - * Ignore request in both cases. Otherwise, make - * a copy before anything might change the static - * get_bookmark_filename() buffer. - FM + * If filename is NULL, must create a new file. If + * filename is a space, an invalid bookmark file was + * selected, or if zero-length, the user cancelled. + * Ignore request in both cases. Otherwise, make + * a copy before anything might change the static + * get_bookmark_filename() buffer. - FM */ if (filename == NULL) { - first_time = TRUE; + first_time = TRUE; filename_buffer[0] = '\0'; } else { - if (*filename == '\0' || !strcmp(filename," ")) { + if (*filename == '\0' || !strcmp(filename," ")) { FREE(bookmark_URL); return; } @@ -269,22 +276,22 @@ PUBLIC void save_bookmark_link ARGS2( } /* - * If BookmarkPage is NULL, something went - * wrong, so ignore the request. - FM + * If BookmarkPage is NULL, something went + * wrong, so ignore the request. - FM */ if (BookmarkPage == NULL) { - FREE(bookmark_URL); + FREE(bookmark_URL); return; } /* - * If the link will be added to the same - * bookmark file, get confirmation. - FM + * If the link will be added to the same + * bookmark file, get confirmation. - FM */ if (LYMultiBookmarks == TRUE && - strstr(HTLoadedDocumentURL(), - (*BookmarkPage == '.' ? - (BookmarkPage+1) : BookmarkPage)) != NULL) { + strstr(HTLoadedDocumentURL(), + (*BookmarkPage == '.' ? + (BookmarkPage+1) : BookmarkPage)) != NULL) { LYMBM_statusline(MULTIBOOKMARKS_SELF); c = LYgetch(); if (TOUPPER(c) != 'L') { @@ -294,7 +301,7 @@ PUBLIC void save_bookmark_link ARGS2( } /* - * Allow user to change the title. - FM + * Allow user to change the title. - FM */ string_buffer[255] = '\0'; LYstrncpy(string_buffer, title, 255); @@ -309,30 +316,29 @@ PUBLIC void save_bookmark_link ARGS2( } /* - * Create the Title with any left-angle-brackets - * converted to < entities and any ampersands - * converted to & entities. - FM + * Create the Title with any left-angle-brackets + * converted to < entities and any ampersands + * converted to & entities. - FM */ StrAllocCopy(Title, string_buffer); LYEntify(&Title, TRUE); /* - * Create the bookmark file, if it doesn't exist already, - * Otherwise, open the pre-existing bookmark file. - FM + * Create the bookmark file, if it doesn't exist already, + * Otherwise, open the pre-existing bookmark file. - FM */ #if defined(__DJGPP__) || defined(_WINDOWS) _fmode = O_TEXT; #endif /* __DJGPP__ or _WINDOWS */ if (first_time) { - /* + /* * Seek it in the home path. - FM */ LYAddPathToHome(filename_buffer, sizeof(filename_buffer), BookmarkPage); } - if (TRACE) - fprintf(stderr, "\nsave_bookmark_link: SEEKING %s\n AS %s\n\n", + CTRACE(tfp, "\nsave_bookmark_link: SEEKING %s\n AS %s\n\n", BookmarkPage, filename_buffer); if ((fp = fopen(filename_buffer, (first_time ? "w" : "a+"))) == NULL) { LYMBM_statusline(BOOKMARK_OPEN_FAILED); @@ -342,13 +348,13 @@ PUBLIC void save_bookmark_link ARGS2( } /* - * Convert all ampersands in the address to & entities. - FM + * Convert all ampersands in the address to & entities. - FM */ StrAllocCopy(Address, address); LYEntify(&Address, FALSE); /* - * If we created a new bookmark file, write the headers. - FM + * If we created a new bookmark file, write the headers. - FM */ if (first_time) { fprintf(fp,"<head>\n"); @@ -365,7 +371,7 @@ PUBLIC void save_bookmark_link ARGS2( } /* - * Add the bookmark link, in Mosaic hotlist or Lynx format. - FM + * Add the bookmark link, in Mosaic hotlist or Lynx format. - FM */ if (is_mosaic_hotlist) { time_t NowTime = time(NULL); @@ -383,14 +389,14 @@ PUBLIC void save_bookmark_link ARGS2( _fmode = O_BINARY; #endif /* __DJGPP__ or _WINDOWS */ /* - * If this is a cached bookmark file, set nocache for - * it so we'll see the new bookmark link when that - * cache is retrieved. - FM + * If this is a cached bookmark file, set nocache for + * it so we'll see the new bookmark link when that + * cache is retrieved. - FM */ if (!first_time && nhist > 0 && bookmark_URL) { - for (i = 0; i < nhist; i++) { + for (i = 0; i < nhist; i++) { if (history[i].bookmark && - !strcmp(history[i].address, bookmark_URL)) { + !strcmp(history[i].address, bookmark_URL)) { WWWDoc.address = history[i].address; WWWDoc.post_data = NULL; WWWDoc.post_content_type = NULL; @@ -399,7 +405,7 @@ PUBLIC void save_bookmark_link ARGS2( WWWDoc.safe = FALSE; if (((tmpanchor = HTAnchor_parent( HTAnchor_findAddress(&WWWDoc) - )) != NULL) && + )) != NULL) && (text = (HText *)HTAnchor_document(tmpanchor)) != NULL) { HText_setNoCache(text); } @@ -409,7 +415,7 @@ PUBLIC void save_bookmark_link ARGS2( } /* - * Clean up and report success. + * Clean up and report success. */ FREE(Title); FREE(Address); @@ -417,7 +423,7 @@ PUBLIC void save_bookmark_link ARGS2( LYMBM_statusline(OPERATION_DONE); sleep(MessageSecs); } - + /* * Remove a link from a bookmark file. The calling * function is expected to have used get_filename_link(), @@ -427,7 +433,7 @@ PUBLIC void save_bookmark_link ARGS2( */ PUBLIC void remove_bookmark_link ARGS2( int, cur, - char *, cur_bookmark_page) + char *, cur_bookmark_page) { FILE *fp, *nfp; char buf[BUFSIZ]; @@ -442,17 +448,14 @@ PUBLIC void remove_bookmark_link ARGS2( mode_t mode; #endif /* VMS */ - if (TRACE) - fprintf(stderr, "remove_bookmark_link: deleting link number: %d\n", - cur); + CTRACE(tfp, "remove_bookmark_link: deleting link number: %d\n", cur); if (!cur_bookmark_page) return; LYAddPathToHome(filename_buffer, sizeof(filename_buffer), cur_bookmark_page); - if (TRACE) - fprintf(stderr, "\nremove_bookmark_link: SEEKING %s\n AS %s\n\n", + CTRACE(tfp, "\nremove_bookmark_link: SEEKING %s\n AS %s\n\n", cur_bookmark_page, filename_buffer); if ((fp = fopen(filename_buffer, "r")) == NULL) { _statusline(BOOKMARK_OPEN_FAILED_FOR_DEL); @@ -478,7 +481,7 @@ PUBLIC void remove_bookmark_link ARGS2( #ifdef UNIX /* - * Explicitly preserve bookmark file mode on Unix. - DSL + * Explicitly preserve bookmark file mode on Unix. - DSL */ if (stat(filename_buffer, &stat_buf) == 0) { mode = ((stat_buf.st_mode & 0777) | HIDE_CHMOD); @@ -497,12 +500,12 @@ PUBLIC void remove_bookmark_link ARGS2( if (is_mosaic_hotlist) { int del_line = cur*2; /* two lines per entry */ n = -3; /* skip past cookie and name lines */ - while (fgets(buf, sizeof(buf), fp) != NULL) { + while (fgets(buf, sizeof(buf), fp) != NULL) { n++; - if (n == del_line || n == del_line+1) + if (n == del_line || n == del_line+1) continue; /* remove two lines */ - if (fputs(buf, nfp) == EOF) - goto failure; + if (fputs(buf, nfp) == EOF) + goto failure; } } else { @@ -510,34 +513,31 @@ PUBLIC void remove_bookmark_link ARGS2( BOOLEAN retain; int seen; - n = -1; - while (fgets(buf, sizeof(buf), fp) != NULL) { + n = -1; + while (fgets(buf, sizeof(buf), fp) != NULL) { retain = TRUE; seen = 0; cp = buf; - while (n < cur && (cp = LYstrstr(cp, "<a href="))) { + while (n < cur && (cp = LYstrstr(cp, "<a href="))) { seen++; - if (++n == cur) { + if (++n == cur) { if (seen != 1 || !LYstrstr(buf, "</a>") || LYstrstr((cp + 1), "<a href=")) { _statusline(BOOKMARK_LINK_NOT_ONE_LINE); sleep(AlertSecs); goto failure; } - if (TRACE) - fprintf(stderr, - "remove_bookmark_link: skipping link %d\n", n); - retain = FALSE; + CTRACE(tfp, "remove_bookmark_link: skipping link %d\n", n); + retain = FALSE; } cp += 8; - } - if (retain && fputs(buf, nfp) == EOF) - goto failure; - } + } + if (retain && fputs(buf, nfp) == EOF) + goto failure; + } } - if (TRACE) - fprintf(stderr, "remove_bookmark_link: files: %s %s\n", + CTRACE(tfp, "remove_bookmark_link: files: %s %s\n", newfile, filename_buffer); fclose(fp); @@ -554,7 +554,7 @@ PUBLIC void remove_bookmark_link ARGS2( * Purge lower version of file. */ sprintf(VMSfilename, "%s;-1", filename_buffer); - while (remove(VMSfilename) == 0) + while (remove(VMSfilename) == 0) ; /* * Reset version number. @@ -562,7 +562,7 @@ PUBLIC void remove_bookmark_link ARGS2( sprintf(VMSfilename, "%s;1", filename_buffer); rename(filename_buffer, VMSfilename); #endif /* VMS */ - return; + return; } else { #ifndef VMS /* @@ -571,10 +571,10 @@ PUBLIC void remove_bookmark_link ARGS2( * Used to be ODD_RENAME */ #ifdef _WINDOWS - if (errno == ENOTSAM) { + if (errno == ENOTSAM) { #else if (errno == EXDEV) { -#endif /* WINDOWS */ +#endif /* WINDOWS */ char buffer[2048]; sprintf(buffer, "%s %s %s", MV_PATH, newfile, filename_buffer); system(buffer); @@ -591,14 +591,14 @@ PUBLIC void remove_bookmark_link ARGS2( perror("renaming the file"); sleep(AlertSecs); } - + failure: _statusline(BOOKMARK_DEL_FAILED); sleep(AlertSecs); if (nfp != NULL) fclose(nfp); if (fp != NULL) - fclose(fp); + fclose(fp); remove(newfile); } @@ -610,19 +610,19 @@ PUBLIC int select_multi_bookmarks NOARGS int c; /* - * If not enabled, pick the "default" (0). + * If not enabled, pick the "default" (0). */ if (LYMultiBookmarks == FALSE || LYHaveSubBookmarks() == FALSE) { if (MBM_A_subbookmark[0]) /* If it exists! */ - return(0); + return(0); else - return(-1); + return(-1); } /* - * For ADVANCED users, we can just mess with the status line to save - * the 2 redraws of the screen, if LYMBMAdvnced is TRUE. '=' will - * still show the screen and let them do it the "long" way. + * For ADVANCED users, we can just mess with the status line to save + * the 2 redraws of the screen, if LYMBMAdvnced is TRUE. '=' will + * still show the screen and let them do it the "long" way. */ if (LYMBMAdvanced && user_mode == ADVANCED_MODE) { LYMBM_statusline(MULTIBOOKMARKS_SELECT); @@ -632,18 +632,18 @@ get_advanced_choice: if (HadVMSInterrupt) { HadVMSInterrupt = FALSE; c = 7; - } + } #endif /* VMS */ if (LYisNonAlnumKeyname(c, LYK_PREV_DOC) || c == 7 || c == 3) { /* - * Treat left-arrow, ^G, or ^C as cancel. + * Treat left-arrow, ^G, or ^C as cancel. */ return(-2); } if (LYisNonAlnumKeyname(c, LYK_REFRESH)) { /* - * Refresh the screen. + * Refresh the screen. */ lynx_force_repaint(); refresh(); @@ -651,19 +651,19 @@ get_advanced_choice: } if (LYisNonAlnumKeyname(c, LYK_ACTIVATE)) { /* - * Assume default bookmark file on ENTER or right-arrow. + * Assume default bookmark file on ENTER or right-arrow. */ return (MBM_A_subbookmark[0] ? 0 : -1); } switch (c) { case '=': - /* + /* * Get the choice via the menu. */ return(select_menu_multi_bookmarks()); default: - /* + /* * Convert to an array index, act on it if valid. * Otherwise, get another keystroke. */ @@ -677,7 +677,7 @@ get_advanced_choice: */ return (MBM_A_subbookmark[c] ? c : -1); } else { - /* + /* * Get the choice via the menu. */ return(select_menu_multi_bookmarks()); @@ -695,41 +695,41 @@ PUBLIC int select_menu_multi_bookmarks NOARGS char shead_buffer[256]; /* - * If not enabled, pick the "default" (0). + * If not enabled, pick the "default" (0). */ if (LYMultiBookmarks == FALSE) return(0); /* - * Filip M. Gieszczykiewicz (filipg@paranoia.com) & FM - * --------------------------------------------------- - * LYMultiBookmarks - TRUE when multi_support enabled. + * Filip M. Gieszczykiewicz (filipg@paranoia.com) & FM + * --------------------------------------------------- + * LYMultiBookmarks - TRUE when multi_support enabled. * - * MBM_A_subbookmark[n] - Hold values of the respective - * "multi_bookmarkn" in the lynxrc file. + * MBM_A_subbookmark[n] - Hold values of the respective + * "multi_bookmarkn" in the lynxrc file. * - * MBM_A_subdescript[n] - Hold description entries in the - * lynxrc file. + * MBM_A_subdescript[n] - Hold description entries in the + * lynxrc file. * - * Note: MBM_A_subbookmark[0] is defined to be same value as - * "bookmark_file" in the lynxrc file and/or the startup - * "bookmark_page". + * Note: MBM_A_subbookmark[0] is defined to be same value as + * "bookmark_file" in the lynxrc file and/or the startup + * "bookmark_page". * - * We make the display of bookmarks depend on rows we have - * available. + * We make the display of bookmarks depend on rows we have + * available. * - * We load BookmarkPage with the valid MBM_A_subbookmark[n] - * via get_bookmark_filename(). Otherwise, that function - * returns a zero-length string to indicate a cancel, a - * single space to indicate an invalid choice, or NULL to - * indicate an inaccessible file. + * We load BookmarkPage with the valid MBM_A_subbookmark[n] + * via get_bookmark_filename(). Otherwise, that function + * returns a zero-length string to indicate a cancel, a + * single space to indicate an invalid choice, or NULL to + * indicate an inaccessible file. */ MBM_allow=(LYlines-7); /* We need 7 for header and footer */ /* - * Screen big enough? + * Screen big enough? */ if (MBM_allow <= 0) { - /* + /* * Too small. */ _statusline(MULTIBOOKMARKS_SMALL); @@ -737,10 +737,10 @@ PUBLIC int select_menu_multi_bookmarks NOARGS return (-2); } /* - * Load the bad choice message buffer. + * Load the bad choice message buffer. */ sprintf(string_buffer, - BOOKMARK_FILE_NOT_DEFINED, + BOOKMARK_FILE_NOT_DEFINED, key_for_func(LYK_OPTIONS)); MBM_screens = (MBM_V_MAXFILES/MBM_allow)+1; /* int rounds off low. */ @@ -759,21 +759,21 @@ draw_bookmark_choices: MBM_to = MBM_V_MAXFILES; /* - * Display menu of bookmarks. NOTE that we avoid printw()'s - * to increase the chances that any non-ASCII or multibyte/CJK - * characters will be handled properly. - FM + * Display menu of bookmarks. NOTE that we avoid printw()'s + * to increase the chances that any non-ASCII or multibyte/CJK + * characters will be handled properly. - FM */ clear(); move(1, 5); lynx_start_h1_color (); if (MBM_screens > 1) { - sprintf(shead_buffer, + sprintf(shead_buffer, MULTIBOOKMARKS_SHEAD_MASK, MBM_current, MBM_screens); addstr(shead_buffer); } else { - addstr(MULTIBOOKMARKS_SHEAD); + addstr(MULTIBOOKMARKS_SHEAD); } - + lynx_stop_h1_color (); MBM_tmp_count = 0; @@ -792,7 +792,7 @@ draw_bookmark_choices: } /* - * Don't need to show it if it all fits on one screen! + * Don't need to show it if it all fits on one screen! */ if (MBM_screens > 1) { move(LYlines-2, 0); @@ -845,20 +845,20 @@ get_bookmark_choice: } /* - * Next range, if available. + * Next range, if available. */ if ((c == ']' || LYisNonAlnumKeyname(c, LYK_NEXT_PAGE)) && - MBM_screens > 1) { + MBM_screens > 1) { if (++MBM_current > MBM_screens) MBM_current = 1; goto draw_bookmark_choices; } /* - * Previous range, if available. + * Previous range, if available. */ if ((c == '[' || LYisNonAlnumKeyname(c, LYK_PREV_PAGE)) && - MBM_screens > 1) { + MBM_screens > 1) { if (--MBM_current <= 0) MBM_current = MBM_screens; goto draw_bookmark_choices; @@ -866,12 +866,12 @@ get_bookmark_choice: c = TOUPPER(c) - 'A'; /* - * See if we have a bookmark like that. + * See if we have a bookmark like that. */ if (c < 0 || c > MBM_V_MAXFILES) { goto get_bookmark_choice; } else if (!MBM_A_subbookmark[c]) { - LYMBM_statusline(string_buffer); + LYMBM_statusline(string_buffer); sleep(AlertSecs); LYMBM_statusline(MULTIBOOKMARKS_SAVE); goto get_bookmark_choice; @@ -890,7 +890,7 @@ PUBLIC BOOLEAN LYHaveSubBookmarks NOARGS int i; for (i = 1; i < MBM_V_MAXFILES; i++) { - if (MBM_A_subbookmark[i] != NULL && *MBM_A_subbookmark[i] != '\0') + if (MBM_A_subbookmark[i] != NULL && *MBM_A_subbookmark[i] != '\0') return(TRUE); } @@ -906,13 +906,13 @@ PUBLIC BOOLEAN LYHaveSubBookmarks NOARGS * string will be handled properly. - FM */ PUBLIC void LYMBM_statusline ARGS1( - char *, text) + char *, text) { if (LYMultiBookmarks == TRUE && user_mode == NOVICE_MODE) { LYStatusLine = (LYlines - 1); - _statusline(text); + _statusline(text); LYStatusLine = -1; } else { - _statusline(text); + _statusline(text); } } |